| Message ID | 20200609081318.28023-1-christianshewitt@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | d16d0481e6bab5a916450e4ef0e1c958b550880c |
| Headers | show |
| Series | [v2] soc: amlogic: meson-gx-socinfo: Fix S905X3 and S905D3 ID's | expand |
On 09/06/2020 10:13, Christian Hewitt wrote: > Correct the SoC revision and package bits/mask values for S905D3/X3 to detect > a wider range of observed SoC IDs, and tweak sort order for A311D/S922X. > > S905X3 05 0000 0101 (SEI610 initial devices) > S905X3 10 0001 0000 (ODROID-C4 and recent Android boxes) > S905X3 50 0101 0000 (SEI610 later revisions) > S905D3 04 0000 0100 (VIM3L devices in kernelci) > S905D3 b0 1011 0000 (VIM3L initial production) > > Fixes commit c9cc9bec36d0 ("soc: amlogic: meson-gx-socinfo: Add SM1 and S905X3 IDs") > Suggested-by: Neil Armstrong <narmstrong@baylibre.com> > Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> > --- > drivers/soc/amlogic/meson-gx-socinfo.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c > index 01fc0d20a70d..6f54bd832c8b 100644 > --- a/drivers/soc/amlogic/meson-gx-socinfo.c > +++ b/drivers/soc/amlogic/meson-gx-socinfo.c > @@ -66,10 +66,12 @@ static const struct meson_gx_package_id { > { "A113D", 0x25, 0x22, 0xff }, > { "S905D2", 0x28, 0x10, 0xf0 }, > { "S905X2", 0x28, 0x40, 0xf0 }, > - { "S922X", 0x29, 0x40, 0xf0 }, > { "A311D", 0x29, 0x10, 0xf0 }, > - { "S905X3", 0x2b, 0x5, 0xf }, > - { "S905D3", 0x2b, 0xb0, 0xf0 }, > + { "S922X", 0x29, 0x40, 0xf0 }, > + { "S905D3", 0x2b, 0x4, 0xf5 }, > + { "S905X3", 0x2b, 0x5, 0xf5 }, > + { "S905X3", 0x2b, 0x10, 0x3f }, > + { "S905D3", 0x2b, 0x30, 0x3f }, > { "A113L", 0x2c, 0x0, 0xf8 }, > }; > > Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Neil Armstrong <narmstrong@baylibre.com> writes: > On 09/06/2020 10:13, Christian Hewitt wrote: >> Correct the SoC revision and package bits/mask values for S905D3/X3 to detect >> a wider range of observed SoC IDs, and tweak sort order for A311D/S922X. >> >> S905X3 05 0000 0101 (SEI610 initial devices) >> S905X3 10 0001 0000 (ODROID-C4 and recent Android boxes) >> S905X3 50 0101 0000 (SEI610 later revisions) >> S905D3 04 0000 0100 (VIM3L devices in kernelci) >> S905D3 b0 1011 0000 (VIM3L initial production) >> >> Fixes commit c9cc9bec36d0 ("soc: amlogic: meson-gx-socinfo: Add SM1 and S905X3 IDs") >> Suggested-by: Neil Armstrong <narmstrong@baylibre.com> >> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> >> --- >> drivers/soc/amlogic/meson-gx-socinfo.c | 8 +++++--- >> 1 file changed, 5 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c >> index 01fc0d20a70d..6f54bd832c8b 100644 >> --- a/drivers/soc/amlogic/meson-gx-socinfo.c >> +++ b/drivers/soc/amlogic/meson-gx-socinfo.c >> @@ -66,10 +66,12 @@ static const struct meson_gx_package_id { >> { "A113D", 0x25, 0x22, 0xff }, >> { "S905D2", 0x28, 0x10, 0xf0 }, >> { "S905X2", 0x28, 0x40, 0xf0 }, >> - { "S922X", 0x29, 0x40, 0xf0 }, >> { "A311D", 0x29, 0x10, 0xf0 }, >> - { "S905X3", 0x2b, 0x5, 0xf }, >> - { "S905D3", 0x2b, 0xb0, 0xf0 }, >> + { "S922X", 0x29, 0x40, 0xf0 }, >> + { "S905D3", 0x2b, 0x4, 0xf5 }, >> + { "S905X3", 0x2b, 0x5, 0xf5 }, >> + { "S905X3", 0x2b, 0x10, 0x3f }, >> + { "S905D3", 0x2b, 0x30, 0x3f }, >> { "A113L", 0x2c, 0x0, 0xf8 }, >> }; >> >> > > Acked-by: Neil Armstrong <narmstrong@baylibre.com> Queued as a fix for v5.8, Thanks, Kevin
diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c index 01fc0d20a70d..6f54bd832c8b 100644 --- a/drivers/soc/amlogic/meson-gx-socinfo.c +++ b/drivers/soc/amlogic/meson-gx-socinfo.c @@ -66,10 +66,12 @@ static const struct meson_gx_package_id { { "A113D", 0x25, 0x22, 0xff }, { "S905D2", 0x28, 0x10, 0xf0 }, { "S905X2", 0x28, 0x40, 0xf0 }, - { "S922X", 0x29, 0x40, 0xf0 }, { "A311D", 0x29, 0x10, 0xf0 }, - { "S905X3", 0x2b, 0x5, 0xf }, - { "S905D3", 0x2b, 0xb0, 0xf0 }, + { "S922X", 0x29, 0x40, 0xf0 }, + { "S905D3", 0x2b, 0x4, 0xf5 }, + { "S905X3", 0x2b, 0x5, 0xf5 }, + { "S905X3", 0x2b, 0x10, 0x3f }, + { "S905D3", 0x2b, 0x30, 0x3f }, { "A113L", 0x2c, 0x0, 0xf8 }, };
Correct the SoC revision and package bits/mask values for S905D3/X3 to detect a wider range of observed SoC IDs, and tweak sort order for A311D/S922X. S905X3 05 0000 0101 (SEI610 initial devices) S905X3 10 0001 0000 (ODROID-C4 and recent Android boxes) S905X3 50 0101 0000 (SEI610 later revisions) S905D3 04 0000 0100 (VIM3L devices in kernelci) S905D3 b0 1011 0000 (VIM3L initial production) Fixes commit c9cc9bec36d0 ("soc: amlogic: meson-gx-socinfo: Add SM1 and S905X3 IDs") Suggested-by: Neil Armstrong <narmstrong@baylibre.com> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> --- drivers/soc/amlogic/meson-gx-socinfo.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)