soc: amlogic: gx-socinfo: Add new SoC IDs and Packages IDs

This adds the:
- G12A SoC ID and S905X2, S905D2 package IDs, found booting the
  X96 Max and U200 Reference Board
- G12B SoC ID and S922X package ID, found booting the Odroid-N2
- S805X, S805Y package IDs found in the vendor U-Boot source

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>

diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c
index 1ae339f5eadbd17d716f814d65d824852c954848..c8d138d85f34b464f3286247b4863dd471dbf0ac 100644 (file)
--- a/drivers/soc/amlogic/meson-gx-socinfo.c
+++ b/drivers/soc/amlogic/meson-gx-socinfo.c
@@ -37,6 +37,8 @@ static const struct meson_gx_soc_id {
        { "AXG", 0x25 },
        { "GXLX", 0x26 },
        { "TXHD", 0x27 },
        { "AXG", 0x25 },
        { "GXLX", 0x26 },
        { "TXHD", 0x27 },

+       { "G12A", 0x28 },
+       { "G12B", 0x29 },

 };
 
 static const struct meson_gx_package_id {
 };
 
 static const struct meson_gx_package_id {


@@ -53,11 +55,16 @@ static const struct meson_gx_package_id {
        { "S905W", 0x21, 0xa0, 0xf0 },
        { "S905L", 0x21, 0xc0, 0xf0 },
        { "S905M2", 0x21, 0xe0, 0xf0 },
        { "S905W", 0x21, 0xa0, 0xf0 },
        { "S905L", 0x21, 0xc0, 0xf0 },
        { "S905M2", 0x21, 0xe0, 0xf0 },

+       { "S805X", 0x21, 0x30, 0xf0 },
+       { "S805Y", 0x21, 0xb0, 0xf0 },

        { "S912", 0x22, 0, 0x0 }, /* Only S912 is known for GXM */
        { "962X", 0x24, 0x10, 0xf0 },
        { "962E", 0x24, 0x20, 0xf0 },
        { "A113X", 0x25, 0x37, 0xff },
        { "A113D", 0x25, 0x22, 0xff },
        { "S912", 0x22, 0, 0x0 }, /* Only S912 is known for GXM */
        { "962X", 0x24, 0x10, 0xf0 },
        { "962E", 0x24, 0x20, 0xf0 },
        { "A113X", 0x25, 0x37, 0xff },
        { "A113D", 0x25, 0x22, 0xff },

+       { "S905D2", 0x28, 0x10, 0xf0 },
+       { "S905X2", 0x28, 0x40, 0xf0 },
+       { "S922X", 0x29, 0x40, 0xf0 },

 };
 
 static inline unsigned int socinfo_to_major(u32 socinfo)
 };
 
 static inline unsigned int socinfo_to_major(u32 socinfo)