| Message ID | 1571646004-21269-1-git-send-email-christianshewitt@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | fdfc6997bd083acd066db99792694fa8a31a6cac |
| Headers | show |
| Series | [v2] soc: amlogic: meson-gx-socinfo: Fix S905D3 ID for VIM3L | expand |
On 21/10/2019 10:20, Christian Hewitt wrote: > Chip on the board is S905D3 not S905X3: > > [ 0.098998] soc soc0: Amlogic Meson SM1 (S905D3) Revision 2b:c (b0:2) Detected > > Change from v1: use 0xf0 mask instead of 0xf2 as advised by Neil Armstrong. > > Fixes: 1d7c541b8a5b ("soc: amlogic: meson-gx-socinfo: Add S905X3 ID for VIM3L") > > Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> > --- > drivers/soc/amlogic/meson-gx-socinfo.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c > index 87ed558..01fc0d2 100644 > --- a/drivers/soc/amlogic/meson-gx-socinfo.c > +++ b/drivers/soc/amlogic/meson-gx-socinfo.c > @@ -69,7 +69,7 @@ static const struct meson_gx_package_id { > { "S922X", 0x29, 0x40, 0xf0 }, > { "A311D", 0x29, 0x10, 0xf0 }, > { "S905X3", 0x2b, 0x5, 0xf }, > - { "S905X3", 0x2b, 0xb0, 0xf2 }, > + { "S905D3", 0x2b, 0xb0, 0xf0 }, > { "A113L", 0x2c, 0x0, 0xf8 }, > }; > > Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Neil Armstrong <narmstrong@baylibre.com> writes: > On 21/10/2019 10:20, Christian Hewitt wrote: >> Chip on the board is S905D3 not S905X3: >> >> [ 0.098998] soc soc0: Amlogic Meson SM1 (S905D3) Revision 2b:c (b0:2) Detected >> >> Change from v1: use 0xf0 mask instead of 0xf2 as advised by Neil Armstrong. >> >> Fixes: 1d7c541b8a5b ("soc: amlogic: meson-gx-socinfo: Add S905X3 ID for VIM3L") >> >> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> >> --- >> drivers/soc/amlogic/meson-gx-socinfo.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c >> index 87ed558..01fc0d2 100644 >> --- a/drivers/soc/amlogic/meson-gx-socinfo.c >> +++ b/drivers/soc/amlogic/meson-gx-socinfo.c >> @@ -69,7 +69,7 @@ static const struct meson_gx_package_id { >> { "S922X", 0x29, 0x40, 0xf0 }, >> { "A311D", 0x29, 0x10, 0xf0 }, >> { "S905X3", 0x2b, 0x5, 0xf }, >> - { "S905X3", 0x2b, 0xb0, 0xf2 }, >> + { "S905D3", 0x2b, 0xb0, 0xf0 }, >> { "A113L", 0x2c, 0x0, 0xf8 }, >> }; >> >> > > Acked-by: Neil Armstrong <narmstrong@baylibre.com> Queued for v5.5, Kevin
diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c index 87ed558..01fc0d2 100644 --- a/drivers/soc/amlogic/meson-gx-socinfo.c +++ b/drivers/soc/amlogic/meson-gx-socinfo.c @@ -69,7 +69,7 @@ static const struct meson_gx_package_id { { "S922X", 0x29, 0x40, 0xf0 }, { "A311D", 0x29, 0x10, 0xf0 }, { "S905X3", 0x2b, 0x5, 0xf }, - { "S905X3", 0x2b, 0xb0, 0xf2 }, + { "S905D3", 0x2b, 0xb0, 0xf0 }, { "A113L", 0x2c, 0x0, 0xf8 }, };
Chip on the board is S905D3 not S905X3: [ 0.098998] soc soc0: Amlogic Meson SM1 (S905D3) Revision 2b:c (b0:2) Detected Change from v1: use 0xf0 mask instead of 0xf2 as advised by Neil Armstrong. Fixes: 1d7c541b8a5b ("soc: amlogic: meson-gx-socinfo: Add S905X3 ID for VIM3L") Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> --- drivers/soc/amlogic/meson-gx-socinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)