Skip to content

Commit 044d71b

Browse files
thertpkhilman
authored andcommitted
meson-gx-socinfo: Fix package id parsing
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: a9daaba ("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]>
1 parent 0f0e290 commit 044d71b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/soc/amlogic/meson-gx-socinfo.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#define AO_SEC_SOCINFO_OFFSET AO_SEC_SD_CFG8
2121

2222
#define SOCINFO_MAJOR GENMASK(31, 24)
23-
#define SOCINFO_MINOR GENMASK(23, 16)
24-
#define SOCINFO_PACK GENMASK(15, 8)
23+
#define SOCINFO_PACK GENMASK(23, 16)
24+
#define SOCINFO_MINOR GENMASK(15, 8)
2525
#define SOCINFO_MISC GENMASK(7, 0)
2626

2727
static const struct meson_gx_soc_id {

0 commit comments

Comments
 (0)