2018-02-14 15:00:07

by Neil Armstrong

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

Updates the Amlogic Meson SoCs IDs for the Armv8 based SoCs.
It includes the new families and packages.

Signed-off-by: Neil Armstrong <[email protected]>
---
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)
--
2.7.4

2018-02-15 10:15:56

by Jerome Brunet

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

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 <[email protected]>
> ---
> 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.

2018-03-08 01:09:41

by Kevin Hilman

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

Jerome Brunet <[email protected]> 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 <[email protected]>
>> ---
>> 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?

Kevin

2018-03-08 09:38:15

by Neil Armstrong

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

Hi Kevin,

On 08/03/2018 02:08, Kevin Hilman wrote:
> Jerome Brunet <[email protected]> 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 <[email protected]>
>>> ---
>>> 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 ?

>
> Kevin
>

2018-03-08 19:46:41

by Kevin Hilman

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

Neil Armstrong <[email protected]> writes:

> Hi Kevin,
>
> On 08/03/2018 02:08, Kevin Hilman wrote:
>> Jerome Brunet <[email protected]> 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 <[email protected]>
>>>> ---
>>>> 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