imrcpan/erofs-linux
1
0 Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git synced 2026-11-14 05:52:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

meson-gx-socinfo: Fix package id parsing

Browse Source 
I've noticed the following message while booting a S905X based board:

soc soc0: Amlogic Meson GXL (S905D) Revision 21:82 (b:2) Detected

The S905D string is obviously wrong. The vendor code does:
...
        ver = (readl(assist_hw_rev) >> 8) & 0xff;
        meson_cpu_version[MESON_CPU_VERSION_LVL_MINOR] = ver;
        ver =  (readl(assist_hw_rev) >> 16) & 0xff;
        meson_cpu_version[MESON_CPU_VERSION_LVL_PACK] = ver;
...

while the current code does:
...
...

This means that the current mainline code has package id and minor
version reversed.

Fixes: a9daaba296 ("soc: Add Amlogic SoC Information driver")
Signed-off-by: Arnaud Patard <[email protected]>
Acked-by: Neil Armstrong <[email protected]>
Signed-off-by: Kevin Hilman <[email protected]>
This commit is contained in:
Arnaud Patard authored and Kevin Hilman committed 2017-11-30 15:29:44 -08:00
1 parent 0f0e290a66
commit 044d71bc6c
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
drivers/soc/amlogic/meson-gx-socinfo.c
+2 -2
View File
@@ -20,8 +20,8 @@
#define AO_SEC_SOCINFO_OFFSET AO_SEC_SD_CFG8
#define SOCINFO_MAJOR GENMASK(31, 24)
#define SOCINFO_MINOR GENMASK(23, 16)
#define SOCINFO_PACK GENMASK(15, 8)
#define SOCINFO_PACK GENMASK(23, 16)
#define SOCINFO_MINOR GENMASK(15, 8)
#define SOCINFO_MISC GENMASK(7, 0)
static const struct meson_gx_soc_id {