Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2117bba3 authored by Arnaud Patard's avatar Arnaud Patard Committed by Greg Kroah-Hartman
Browse files

meson-gx-socinfo: Fix package id parsing 




[ Upstream commit 044d71bc6cdee8980d0fdc35ec79a0d5818b2ce3 ]

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: a9daaba2 ("soc: Add Amlogic SoC Information driver")
Signed-off-by: default avatarArnaud Patard <apatard@hupstream.com>
Acked-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 844dfa1b

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

+2 −2
Original line number Diff line number Diff line
@@ -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 {