aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Armstrong <narmstrong@baylibre.com>2018-03-12 07:17:40 -0400
committerKevin Hilman <khilman@baylibre.com>2018-03-19 19:40:26 -0400
commitf842c41adc044e4586dd232c6e889f9d46180fa8 (patch)
treef3f2d3b884b78fb5682c5663b3892c602e0f957a
parente0270c8089ae65f7e5180b56a9fe1fdc7435a326 (diff)
amlogic: meson-gx-socinfo: Update soc ids
Updates the Amlogic Meson SoCs IDs for the Armv8 based SoCs. It includes the new families and packages. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Signed-off-by: Kevin Hilman <khilman@baylibre.com>
-rw-r--r--drivers/soc/amlogic/meson-gx-socinfo.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c
index ea091f1f7dae..37ea0a1c24c8 100644
--- a/drivers/soc/amlogic/meson-gx-socinfo.c
+++ b/drivers/soc/amlogic/meson-gx-socinfo.c
@@ -33,6 +33,10 @@ static const struct meson_gx_soc_id {
33 { "GXL", 0x21 }, 33 { "GXL", 0x21 },
34 { "GXM", 0x22 }, 34 { "GXM", 0x22 },
35 { "TXL", 0x23 }, 35 { "TXL", 0x23 },
36 { "TXLX", 0x24 },
37 { "AXG", 0x25 },
38 { "GXLX", 0x26 },
39 { "TXHD", 0x27 },
36}; 40};
37 41
38static const struct meson_gx_package_id { 42static const struct meson_gx_package_id {
@@ -41,12 +45,18 @@ static const struct meson_gx_package_id {
41 unsigned int pack_id; 45 unsigned int pack_id;
42} soc_packages[] = { 46} soc_packages[] = {
43 { "S905", 0x1f, 0 }, 47 { "S905", 0x1f, 0 },
48 { "S905H", 0x1f, 0x13 },
44 { "S905M", 0x1f, 0x20 }, 49 { "S905M", 0x1f, 0x20 },
45 { "S905D", 0x21, 0 }, 50 { "S905D", 0x21, 0 },
46 { "S905X", 0x21, 0x80 }, 51 { "S905X", 0x21, 0x80 },
52 { "S905W", 0x21, 0xa0 },
47 { "S905L", 0x21, 0xc0 }, 53 { "S905L", 0x21, 0xc0 },
48 { "S905M2", 0x21, 0xe0 }, 54 { "S905M2", 0x21, 0xe0 },
49 { "S912", 0x22, 0 }, 55 { "S912", 0x22, 0 },
56 { "962X", 0x24, 0x10 },
57 { "962E", 0x24, 0x20 },
58 { "A113X", 0x25, 0x37 },
59 { "A113D", 0x25, 0x22 },
50}; 60};
51 61
52static inline unsigned int socinfo_to_major(u32 socinfo) 62static inline unsigned int socinfo_to_major(u32 socinfo)