| Message ID | 20190212142344.13634-3-narmstrong@baylibre.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: meson: Add SoC ID detection for G12A | expand |
On Tue, 2019-02-12 at 15:23 +0100, Neil Armstrong wrote: > This adds the G12A and G12B SoC ids and the S90X2 package ID. ^ Small typo here --------------------------------| > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > drivers/soc/amlogic/meson-gx-socinfo.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c > b/drivers/soc/amlogic/meson-gx-socinfo.c > index 1ae339f5eadb..c1a9c34d861b 100644 > --- 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 }, > + { "G12A", 0x28 }, > + { "G12B", 0x29 }, > }; > > static const struct meson_gx_package_id { > @@ -53,11 +55,14 @@ static const struct meson_gx_package_id { > { "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 }, > + { "S905X2", 0x28, 0x40, 0xf0 }, > }; > > static inline unsigned int socinfo_to_major(u32 socinfo)
diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c index 1ae339f5eadb..c1a9c34d861b 100644 --- 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 }, + { "G12A", 0x28 }, + { "G12B", 0x29 }, }; static const struct meson_gx_package_id { @@ -53,11 +55,14 @@ static const struct meson_gx_package_id { { "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 }, + { "S905X2", 0x28, 0x40, 0xf0 }, }; static inline unsigned int socinfo_to_major(u32 socinfo)
This adds the G12A and G12B SoC ids and the S90X2 package ID. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- drivers/soc/amlogic/meson-gx-socinfo.c | 5 +++++ 1 file changed, 5 insertions(+)