Message ID | 20201109133355.2794045-1-narmstrong@baylibre.com |
---|---|
State | Accepted, archived |
Commit | b6a71e26c9caf0d2adbdbbd823498a006b994179 |
Delegated to: | Neil Armstrong |
Headers | show |
Series | ARM: mach-meson: update SoC IDs | expand |
On 09/11/2020 14:33, Neil Armstrong wrote: > Update From Linux commits > - 240051cb833b ("soc: amlogic: meson-gx-socinfo: Add A1 and A113L IDs") > - 1d7c541b8a5b ("soc: amlogic: meson-gx-socinfo: Add S905X3 ID for VIM3L") > - fdfc6997bd08 ("soc: amlogic: meson-gx-socinfo: Fix S905D3 ID for VIM3L") > - d16d0481e6ba ("soc: amlogic: meson-gx-socinfo: Fix S905X3 and S905D3 ID's") > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > arch/arm/mach-meson/board-info.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c > index 3abb27e03b..e61d1adb10 100644 > --- a/arch/arm/mach-meson/board-info.c > +++ b/arch/arm/mach-meson/board-info.c > @@ -38,6 +38,7 @@ static const struct meson_gx_soc_id { > { "G12A", 0x28 }, > { "G12B", 0x29 }, > { "SM1", 0x2b }, > + { "A1", 0x2c }, > }; > > static const struct meson_gx_package_id { > @@ -65,7 +66,11 @@ static const struct meson_gx_package_id { > { "S905X2", 0x28, 0x40, 0xf0 }, > { "A311D", 0x29, 0x10, 0xf0 }, > { "S922X", 0x29, 0x40, 0xf0 }, > - { "S905X3", 0x2b, 0x5, 0xf }, > + { "S905D3", 0x2b, 0x4, 0xf5 }, > + { "S905X3", 0x2b, 0x5, 0xf5 }, > + { "S905X3", 0x2b, 0x10, 0x3f }, > + { "S905D3", 0x2b, 0x30, 0x3f }, > + { "A113L", 0x2c, 0x0, 0xf8 }, > }; > > DECLARE_GLOBAL_DATA_PTR; > Applied to u-boot-amlogic
diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c index 3abb27e03b..e61d1adb10 100644 --- a/arch/arm/mach-meson/board-info.c +++ b/arch/arm/mach-meson/board-info.c @@ -38,6 +38,7 @@ static const struct meson_gx_soc_id { { "G12A", 0x28 }, { "G12B", 0x29 }, { "SM1", 0x2b }, + { "A1", 0x2c }, }; static const struct meson_gx_package_id { @@ -65,7 +66,11 @@ static const struct meson_gx_package_id { { "S905X2", 0x28, 0x40, 0xf0 }, { "A311D", 0x29, 0x10, 0xf0 }, { "S922X", 0x29, 0x40, 0xf0 }, - { "S905X3", 0x2b, 0x5, 0xf }, + { "S905D3", 0x2b, 0x4, 0xf5 }, + { "S905X3", 0x2b, 0x5, 0xf5 }, + { "S905X3", 0x2b, 0x10, 0x3f }, + { "S905D3", 0x2b, 0x30, 0x3f }, + { "A113L", 0x2c, 0x0, 0xf8 }, }; DECLARE_GLOBAL_DATA_PTR;
Update From Linux commits - 240051cb833b ("soc: amlogic: meson-gx-socinfo: Add A1 and A113L IDs") - 1d7c541b8a5b ("soc: amlogic: meson-gx-socinfo: Add S905X3 ID for VIM3L") - fdfc6997bd08 ("soc: amlogic: meson-gx-socinfo: Fix S905D3 ID for VIM3L") - d16d0481e6ba ("soc: amlogic: meson-gx-socinfo: Fix S905X3 and S905D3 ID's") Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- arch/arm/mach-meson/board-info.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)