* [PATCH 1/5] soc: amlogic: meson-gx-socinfo: add new SoCs id
2024-07-12 6:54 [PATCH 0/5] Add new Amlogic SoCs info defines Xianwei Zhao via B4 Relay
@ 2024-07-12 6:54 ` Xianwei Zhao via B4 Relay
2024-07-12 10:10 ` Neil Armstrong
2024-07-12 6:54 ` [PATCH 2/5] arm64: dts: amlogic: s4: add ao secure node Xianwei Zhao via B4 Relay
` (3 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Xianwei Zhao via B4 Relay @ 2024-07-12 6:54 UTC (permalink / raw)
To: Neil Armstrong, Kevin Hilman, Jerome Brunet, Martin Blumenstingl,
Rob Herring, Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-kernel, linux-amlogic, linux-kernel, devicetree,
Xianwei Zhao
From: Xianwei Zhao <xianwei.zhao@amlogic.com>
Add new definition for Amlogi SoCs, include S4, C3, T7, A4, A5.
Signed-off-by: Xianwei Zhao <xianwei.zhao@amlogic.com>
---
drivers/soc/amlogic/meson-gx-socinfo.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c
index 8809a948201a..7549f1644e5e 100644
--- a/drivers/soc/amlogic/meson-gx-socinfo.c
+++ b/drivers/soc/amlogic/meson-gx-socinfo.c
@@ -41,6 +41,11 @@ static const struct meson_gx_soc_id {
{ "G12B", 0x29 },
{ "SM1", 0x2b },
{ "A1", 0x2c },
+ { "T7", 0x36 },
+ { "S4", 0x37 },
+ { "A5", 0x3c },
+ { "C3", 0x3d },
+ { "A4", 0x40 },
};
static const struct meson_gx_package_id {
@@ -76,6 +81,11 @@ static const struct meson_gx_package_id {
{ "S905X3", 0x2b, 0x10, 0x3f },
{ "S905D3", 0x2b, 0x30, 0x3f },
{ "A113L", 0x2c, 0x0, 0xf8 },
+ { "S805X2", 0x37, 0x2, 0xf },
+ { "C308L", 0x3d, 0x1, 0xf },
+ { "A311D2", 0x36, 0x1, 0xf },
+ { "A113X2", 0x3c, 0x1, 0xf },
+ { "A113L2", 0x40, 0x1, 0xf },
};
static inline unsigned int socinfo_to_major(u32 socinfo)
--
2.37.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 1/5] soc: amlogic: meson-gx-socinfo: add new SoCs id
2024-07-12 6:54 ` [PATCH 1/5] soc: amlogic: meson-gx-socinfo: add new SoCs id Xianwei Zhao via B4 Relay
@ 2024-07-12 10:10 ` Neil Armstrong
0 siblings, 0 replies; 9+ messages in thread
From: Neil Armstrong @ 2024-07-12 10:10 UTC (permalink / raw)
To: xianwei.zhao, Kevin Hilman, Jerome Brunet, Martin Blumenstingl,
Rob Herring, Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-kernel, linux-amlogic, linux-kernel, devicetree
On 12/07/2024 08:54, Xianwei Zhao via B4 Relay wrote:
> From: Xianwei Zhao <xianwei.zhao@amlogic.com>
>
> Add new definition for Amlogi SoCs, include S4, C3, T7, A4, A5.
>
> Signed-off-by: Xianwei Zhao <xianwei.zhao@amlogic.com>
> ---
> drivers/soc/amlogic/meson-gx-socinfo.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c
> index 8809a948201a..7549f1644e5e 100644
> --- a/drivers/soc/amlogic/meson-gx-socinfo.c
> +++ b/drivers/soc/amlogic/meson-gx-socinfo.c
> @@ -41,6 +41,11 @@ static const struct meson_gx_soc_id {
> { "G12B", 0x29 },
> { "SM1", 0x2b },
> { "A1", 0x2c },
> + { "T7", 0x36 },
> + { "S4", 0x37 },
> + { "A5", 0x3c },
> + { "C3", 0x3d },
> + { "A4", 0x40 },
> };
>
> static const struct meson_gx_package_id {
> @@ -76,6 +81,11 @@ static const struct meson_gx_package_id {
> { "S905X3", 0x2b, 0x10, 0x3f },
> { "S905D3", 0x2b, 0x30, 0x3f },
> { "A113L", 0x2c, 0x0, 0xf8 },
> + { "S805X2", 0x37, 0x2, 0xf },
> + { "C308L", 0x3d, 0x1, 0xf },
> + { "A311D2", 0x36, 0x1, 0xf },
> + { "A113X2", 0x3c, 0x1, 0xf },
> + { "A113L2", 0x40, 0x1, 0xf },
> };
>
> static inline unsigned int socinfo_to_major(u32 socinfo)
>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/5] arm64: dts: amlogic: s4: add ao secure node
2024-07-12 6:54 [PATCH 0/5] Add new Amlogic SoCs info defines Xianwei Zhao via B4 Relay
2024-07-12 6:54 ` [PATCH 1/5] soc: amlogic: meson-gx-socinfo: add new SoCs id Xianwei Zhao via B4 Relay
@ 2024-07-12 6:54 ` Xianwei Zhao via B4 Relay
2024-07-12 7:49 ` Krzysztof Kozlowski
2024-07-12 6:54 ` [PATCH 3/5] arm64: dts: amlogic: c3: " Xianwei Zhao via B4 Relay
` (2 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Xianwei Zhao via B4 Relay @ 2024-07-12 6:54 UTC (permalink / raw)
To: Neil Armstrong, Kevin Hilman, Jerome Brunet, Martin Blumenstingl,
Rob Herring, Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-kernel, linux-amlogic, linux-kernel, devicetree,
Xianwei Zhao
From: Xianwei Zhao <xianwei.zhao@amlogic.com>
Add node for board info registers, which allows getting SoC family and
board revision.
For example, with MESON_GX_SOCINFO config enabled we can get the
following information for board with Amlogic S4 SoC:
soc soc0: Amlogic S4 (S805X2) Revision 37:a (2:1) Detecte
Signed-off-by: Xianwei Zhao <xianwei.zhao@amlogic.com>
---
arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
index c11c947fa18c..316905ec191c 100644
--- a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
@@ -763,6 +763,12 @@ reset: reset-controller@2000 {
#reset-cells = <1>;
};
+ sec_ao: ao-secure@10220 {
+ compatible = "amlogic,meson-gx-ao-secure", "syscon";
+ reg = <0x0 0x10220 0x0 0x140>;
+ amlogic,has-chip-id;
+ };
+
ir: ir@84040 {
compatible = "amlogic,meson-s4-ir";
reg = <0x0 0x84040 0x0 0x30>;
--
2.37.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 2/5] arm64: dts: amlogic: s4: add ao secure node
2024-07-12 6:54 ` [PATCH 2/5] arm64: dts: amlogic: s4: add ao secure node Xianwei Zhao via B4 Relay
@ 2024-07-12 7:49 ` Krzysztof Kozlowski
2024-07-15 3:31 ` Xianwei Zhao
0 siblings, 1 reply; 9+ messages in thread
From: Krzysztof Kozlowski @ 2024-07-12 7:49 UTC (permalink / raw)
To: xianwei.zhao, Neil Armstrong, Kevin Hilman, Jerome Brunet,
Martin Blumenstingl, Rob Herring, Krzysztof Kozlowski,
Conor Dooley
Cc: linux-arm-kernel, linux-amlogic, linux-kernel, devicetree
On 12/07/2024 08:54, Xianwei Zhao via B4 Relay wrote:
> From: Xianwei Zhao <xianwei.zhao@amlogic.com>
>
> Add node for board info registers, which allows getting SoC family and
> board revision.
>
> For example, with MESON_GX_SOCINFO config enabled we can get the
> following information for board with Amlogic S4 SoC:
> soc soc0: Amlogic S4 (S805X2) Revision 37:a (2:1) Detecte
>
> Signed-off-by: Xianwei Zhao <xianwei.zhao@amlogic.com>
> ---
> arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
> index c11c947fa18c..316905ec191c 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
> @@ -763,6 +763,12 @@ reset: reset-controller@2000 {
> #reset-cells = <1>;
> };
>
> + sec_ao: ao-secure@10220 {
> + compatible = "amlogic,meson-gx-ao-secure", "syscon";
This is not gx, but s4, so incorrect compatible used. Same for all other
patches.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 2/5] arm64: dts: amlogic: s4: add ao secure node
2024-07-12 7:49 ` Krzysztof Kozlowski
@ 2024-07-15 3:31 ` Xianwei Zhao
0 siblings, 0 replies; 9+ messages in thread
From: Xianwei Zhao @ 2024-07-15 3:31 UTC (permalink / raw)
To: Krzysztof Kozlowski, Neil Armstrong, Kevin Hilman, Jerome Brunet,
Martin Blumenstingl, Rob Herring, Krzysztof Kozlowski,
Conor Dooley
Cc: linux-arm-kernel, linux-amlogic, linux-kernel, devicetree
Hi Krzysztof,
Thanks for your review.
On 2024/7/12 15:49, Krzysztof Kozlowski wrote:
> [ EXTERNAL EMAIL ]
>
> On 12/07/2024 08:54, Xianwei Zhao via B4 Relay wrote:
>> From: Xianwei Zhao <xianwei.zhao@amlogic.com>
>>
>> Add node for board info registers, which allows getting SoC family and
>> board revision.
>>
>> For example, with MESON_GX_SOCINFO config enabled we can get the
>> following information for board with Amlogic S4 SoC:
>> soc soc0: Amlogic S4 (S805X2) Revision 37:a (2:1) Detecte
>>
>> Signed-off-by: Xianwei Zhao <xianwei.zhao@amlogic.com>
>> ---
>> arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 6 ++++++
>> 1 file changed, 6 insertions(+)
>>
>> diff --git a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
>> index c11c947fa18c..316905ec191c 100644
>> --- a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
>> +++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
>> @@ -763,6 +763,12 @@ reset: reset-controller@2000 {
>> #reset-cells = <1>;
>> };
>>
>> + sec_ao: ao-secure@10220 {
>> + compatible = "amlogic,meson-gx-ao-secure", "syscon";
>
> This is not gx, but s4, so incorrect compatible used. Same for all other
> patches.
>
Will use fallback to fix it.
> Best regards,
> Krzysztof
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/5] arm64: dts: amlogic: c3: add ao secure node
2024-07-12 6:54 [PATCH 0/5] Add new Amlogic SoCs info defines Xianwei Zhao via B4 Relay
2024-07-12 6:54 ` [PATCH 1/5] soc: amlogic: meson-gx-socinfo: add new SoCs id Xianwei Zhao via B4 Relay
2024-07-12 6:54 ` [PATCH 2/5] arm64: dts: amlogic: s4: add ao secure node Xianwei Zhao via B4 Relay
@ 2024-07-12 6:54 ` Xianwei Zhao via B4 Relay
2024-07-12 6:54 ` [PATCH 4/5] arm64: dts: amlogic: t7: " Xianwei Zhao via B4 Relay
2024-07-12 6:54 ` [PATCH 5/5] arm64: dts: amlogic: a4: " Xianwei Zhao via B4 Relay
4 siblings, 0 replies; 9+ messages in thread
From: Xianwei Zhao via B4 Relay @ 2024-07-12 6:54 UTC (permalink / raw)
To: Neil Armstrong, Kevin Hilman, Jerome Brunet, Martin Blumenstingl,
Rob Herring, Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-kernel, linux-amlogic, linux-kernel, devicetree,
Xianwei Zhao
From: Xianwei Zhao <xianwei.zhao@amlogic.com>
Add node for board info registers, which allows getting SoC family and
board revision.
For example, with MESON_GX_SOCINFO config enabled we can get the
following information for board with Amlogic C3 SoC:
soc soc0: Amlogic C3 (C308L) Revision 3d:a (1:1) Detected
Signed-off-by: Xianwei Zhao <xianwei.zhao@amlogic.com>
---
arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
index f8fb060c49ae..d6a94c828fd8 100644
--- a/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
+++ b/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
@@ -129,6 +129,11 @@ uart_b: serial@7a000 {
clock-names = "xtal", "pclk", "baud";
};
+ sec_ao: ao-secure@10220 {
+ compatible = "amlogic,meson-gx-ao-secure", "syscon";
+ reg = <0x0 0x10220 0x0 0x140>;
+ amlogic,has-chip-id;
+ };
};
};
};
--
2.37.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/5] arm64: dts: amlogic: t7: add ao secure node
2024-07-12 6:54 [PATCH 0/5] Add new Amlogic SoCs info defines Xianwei Zhao via B4 Relay
` (2 preceding siblings ...)
2024-07-12 6:54 ` [PATCH 3/5] arm64: dts: amlogic: c3: " Xianwei Zhao via B4 Relay
@ 2024-07-12 6:54 ` Xianwei Zhao via B4 Relay
2024-07-12 6:54 ` [PATCH 5/5] arm64: dts: amlogic: a4: " Xianwei Zhao via B4 Relay
4 siblings, 0 replies; 9+ messages in thread
From: Xianwei Zhao via B4 Relay @ 2024-07-12 6:54 UTC (permalink / raw)
To: Neil Armstrong, Kevin Hilman, Jerome Brunet, Martin Blumenstingl,
Rob Herring, Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-kernel, linux-amlogic, linux-kernel, devicetree,
Xianwei Zhao
From: Xianwei Zhao <xianwei.zhao@amlogic.com>
Add node for board info registers, which allows getting SoC family and
board revision.
For example, with MESON_GX_SOCINFO config enabled we can get the
following information for board with Amlogic T7 SoC:
soc soc0: Amlogic T7 (A311D2) Revision 36:c (1:1) Detected.
Signed-off-by: Xianwei Zhao <xianwei.zhao@amlogic.com>
---
arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi
index c23efc6c7ac0..777935821c3f 100644
--- a/arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi
+++ b/arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi
@@ -194,6 +194,12 @@ uart_a: serial@78000 {
interrupts = <GIC_SPI 168 IRQ_TYPE_EDGE_RISING>;
status = "disabled";
};
+
+ sec_ao: ao-secure@10220 {
+ compatible = "amlogic,meson-gx-ao-secure", "syscon";
+ reg = <0x0 0x10220 0x0 0x140>;
+ amlogic,has-chip-id;
+ };
};
};
--
2.37.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 5/5] arm64: dts: amlogic: a4: add ao secure node
2024-07-12 6:54 [PATCH 0/5] Add new Amlogic SoCs info defines Xianwei Zhao via B4 Relay
` (3 preceding siblings ...)
2024-07-12 6:54 ` [PATCH 4/5] arm64: dts: amlogic: t7: " Xianwei Zhao via B4 Relay
@ 2024-07-12 6:54 ` Xianwei Zhao via B4 Relay
4 siblings, 0 replies; 9+ messages in thread
From: Xianwei Zhao via B4 Relay @ 2024-07-12 6:54 UTC (permalink / raw)
To: Neil Armstrong, Kevin Hilman, Jerome Brunet, Martin Blumenstingl,
Rob Herring, Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-kernel, linux-amlogic, linux-kernel, devicetree,
Xianwei Zhao
From: Xianwei Zhao <xianwei.zhao@amlogic.com>
Add node for board info registers, which allows getting SoC family and
board revision.
For example, with MESON_GX_SOCINFO config enabled we can get the
following information for board with Amlogic A4 SoC:
soc soc0: Amlogic A4 (A113L2) Revision 40:b (1:1) Detected.
Signed-off-by: Xianwei Zhao <xianwei.zhao@amlogic.com>
---
arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi
index 496c3a2bcf25..901103a288e4 100644
--- a/arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi
@@ -67,6 +67,12 @@ uart_b: serial@7a000 {
clock-names = "xtal", "pclk", "baud";
status = "disabled";
};
+
+ sec_ao: ao-secure@10220 {
+ compatible = "amlogic,meson-gx-ao-secure", "syscon";
+ reg = <0x0 0x10220 0x0 0x140>;
+ amlogic,has-chip-id;
+ };
};
};
};
--
2.37.1
^ permalink raw reply related [flat|nested] 9+ messages in thread