[PATCH] amlogic: meson-gx-socinfo: Update soc ids

[Kevin Hilman]

Neil Armstrong <narmstrong at baylibre.com> writes:

> Hi Kevin,
>
> On 08/03/2018 02:08, Kevin Hilman wrote:
>> Jerome Brunet <jbrunet at baylibre.com> writes:
>> 
>>> On Wed, 2018-02-14 at 15:58 +0100, Neil Armstrong wrote:
>>>> Updates the Amlogic Meson SoCs IDs for the Armv8 based SoCs.
>>>> It includes the new families and packages.
>>>>
>>>> Signed-off-by: Neil Armstrong <narmstrong at baylibre.com>
>>>> ---
>>>>  drivers/soc/amlogic/meson-gx-socinfo.c | 8 ++++++++
>>>>  1 file changed, 8 insertions(+)
>>>>
>>>> diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c
>>>> index f2d8c3c..a7efe30 100644
>>>> --- a/drivers/soc/amlogic/meson-gx-socinfo.c
>>>> +++ b/drivers/soc/amlogic/meson-gx-socinfo.c
>>>> @@ -33,6 +33,10 @@ static const struct meson_gx_soc_id {
>>>>  	{ "GXL", 0x21 },
>>>>  	{ "GXM", 0x22 },
>>>>  	{ "TXL", 0x23 },
>>>> +	{ "TXLX", 0x24 },
>>>> +	{ "AXG", 0x25 },
>>>> +	{ "GXLX", 0x26 },
>>>> +	{ "TXHD", 0x27 },
>>>>  };
>>>>  
>>>>  static const struct meson_gx_package_id {
>>>> @@ -47,6 +51,10 @@ static const struct meson_gx_package_id {
>>>>  	{ "S905L", 0x21, 0xc0 },
>>>>  	{ "S905M2", 0x21, 0xe0 },
>>>>  	{ "S912", 0x22, 0 },
>>>> +	{ "962X", 0x24, 0x10 },
>>>> +	{ "962E", 0x24, 0x20 },
>>>> +	{ "A113X", 0x25, 0x37 },
>>>> +	{ "A113D", 0x25, 0xd0 },
>>>>  };
>>>>  
>>>>  static inline unsigned int socinfo_to_major(u32 socinfo)
>>>
>>> Tested on my s400 board which, according to the marking, features an AXG A113D.
>>> AXG is detected correctly but the package id read is 0x22 instead of 0xd0.
>> 
>> Neil, can you update accordingly?  Have you seen 0xd0 on other A11x
>> chips?  or is this from the docs?
>
> I got it from the Amlogic lastest Linux and U-boot code.
> I will set 0x22 and squash the "meson-gx-socinfo: Add package id for S905H" patch, is it ok ?

Sure, that's fine.

Kevin