* [PATCH v4 1/3] dt-bindings: reset: Add compatible for Amlogic A4/A5 Reset Controller
2025-03-13 9:05 [PATCH v4 0/3] Add support for Amlogic A4/A5 Reset Kelvin Zhang via B4 Relay
@ 2025-03-13 9:05 ` Kelvin Zhang via B4 Relay
2025-03-13 9:05 ` [PATCH v4 2/3] arm64: dts: amlogic: Add A4 " Kelvin Zhang via B4 Relay
2025-03-13 9:05 ` [PATCH v4 3/3] arm64: dts: amlogic: Add A5 " Kelvin Zhang via B4 Relay
2 siblings, 0 replies; 8+ messages in thread
From: Kelvin Zhang via B4 Relay @ 2025-03-13 9:05 UTC (permalink / raw)
To: Philipp Zabel, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Neil Armstrong, Kevin Hilman, Jerome Brunet, Martin Blumenstingl
Cc: devicetree, linux-arm-kernel, linux-amlogic, linux-kernel,
Zelong Dong, Conor Dooley, Kelvin Zhang
From: Zelong Dong <zelong.dong@amlogic.com>
Add compatibles for Amlogic A4 and A5 reset controllers,
which fall back to 'amlogic,meson-s4-reset'.
Signed-off-by: Zelong Dong <zelong.dong@amlogic.com>
Acked-by: Conor Dooley <conor.dooley@microchip.com>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Link: https://lore.kernel.org/r/20240918074211.8067-2-zelong.dong@amlogic.com
Signed-off-by: Kelvin Zhang <kelvin.zhang@amlogic.com>
---
.../bindings/reset/amlogic,meson-reset.yaml | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
index 695ef38a7bb346c92b4cf428e7615d45682c940a..150e95c0d9bed74c7045942610a311114a257889 100644
--- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
+++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
@@ -12,14 +12,20 @@ maintainers:
properties:
compatible:
- enum:
- - amlogic,meson8b-reset # Reset Controller on Meson8b and compatible SoCs
- - amlogic,meson-gxbb-reset # Reset Controller on GXBB and compatible SoCs
- - amlogic,meson-axg-reset # Reset Controller on AXG and compatible SoCs
- - amlogic,meson-a1-reset # Reset Controller on A1 and compatible SoCs
- - amlogic,meson-s4-reset # Reset Controller on S4 and compatible SoCs
- - amlogic,c3-reset # Reset Controller on C3 and compatible SoCs
- - amlogic,t7-reset
+ oneOf:
+ - enum:
+ - amlogic,meson8b-reset # Reset Controller on Meson8b and compatible SoCs
+ - amlogic,meson-gxbb-reset # Reset Controller on GXBB and compatible SoCs
+ - amlogic,meson-axg-reset # Reset Controller on AXG and compatible SoCs
+ - amlogic,meson-a1-reset # Reset Controller on A1 and compatible SoCs
+ - amlogic,meson-s4-reset # Reset Controller on S4 and compatible SoCs
+ - amlogic,c3-reset # Reset Controller on C3 and compatible SoCs
+ - amlogic,t7-reset
+ - items:
+ - enum:
+ - amlogic,a4-reset
+ - amlogic,a5-reset
+ - const: amlogic,meson-s4-reset
reg:
maxItems: 1
--
2.37.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v4 2/3] arm64: dts: amlogic: Add A4 Reset Controller
2025-03-13 9:05 [PATCH v4 0/3] Add support for Amlogic A4/A5 Reset Kelvin Zhang via B4 Relay
2025-03-13 9:05 ` [PATCH v4 1/3] dt-bindings: reset: Add compatible for Amlogic A4/A5 Reset Controller Kelvin Zhang via B4 Relay
@ 2025-03-13 9:05 ` Kelvin Zhang via B4 Relay
2025-03-14 8:01 ` Krzysztof Kozlowski
2025-03-13 9:05 ` [PATCH v4 3/3] arm64: dts: amlogic: Add A5 " Kelvin Zhang via B4 Relay
2 siblings, 1 reply; 8+ messages in thread
From: Kelvin Zhang via B4 Relay @ 2025-03-13 9:05 UTC (permalink / raw)
To: Philipp Zabel, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Neil Armstrong, Kevin Hilman, Jerome Brunet, Martin Blumenstingl
Cc: devicetree, linux-arm-kernel, linux-amlogic, linux-kernel,
Zelong Dong, Kelvin Zhang
From: Zelong Dong <zelong.dong@amlogic.com>
Add the device node and related header file for Amlogic
A4 reset controller.
Signed-off-by: Zelong Dong <zelong.dong@amlogic.com>
Link: https://lore.kernel.org/r/20240918074211.8067-3-zelong.dong@amlogic.com
Signed-off-by: Kelvin Zhang <kelvin.zhang@amlogic.com>
---
arch/arm64/boot/dts/amlogic/amlogic-a4-reset.h | 93 ++++++++++++++++++++++++++
arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi | 8 +++
2 files changed, 101 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/amlogic-a4-reset.h b/arch/arm64/boot/dts/amlogic/amlogic-a4-reset.h
new file mode 100644
index 0000000000000000000000000000000000000000..f6a4c90bab3cf7cfaa3c98c522bed5e455b73bd3
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/amlogic-a4-reset.h
@@ -0,0 +1,93 @@
+/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */
+/*
+ * Copyright (c) 2024 Amlogic, Inc. All rights reserved.
+ */
+
+#ifndef __DTS_AMLOGIC_A4_RESET_H
+#define __DTS_AMLOGIC_A4_RESET_H
+
+/* RESET0 */
+/* 0-3 */
+#define RESET_USB 4
+/* 5-6*/
+#define RESET_U2PHY22 7
+#define RESET_USBPHY20 8
+#define RESET_U2PHY21 9
+#define RESET_USB2DRD 10
+#define RESET_U2H 11
+#define RESET_LED_CTRL 12
+/* 13-31 */
+
+/* RESET1 */
+#define RESET_AUDIO 32
+#define RESET_AUDIO_VAD 33
+/* 34*/
+#define RESET_DDR_APB 35
+#define RESET_DDR 36
+#define RESET_VOUT_VENC 37
+#define RESET_VOUT 38
+/* 39-47 */
+#define RESET_ETHERNET 48
+/* 49-63 */
+
+/* RESET2 */
+#define RESET_DEVICE_MMC_ARB 64
+#define RESET_IRCTRL 65
+/* 66*/
+#define RESET_TS_PLL 67
+/* 68-72*/
+#define RESET_SPICC_0 73
+#define RESET_SPICC_1 74
+/* 75-79*/
+#define RESET_MSR_CLK 80
+/* 81*/
+#define RESET_SAR_ADC 82
+/* 83-87*/
+#define RESET_ACODEC 88
+/* 89-90*/
+#define RESET_WATCHDOG 91
+/* 92-95*/
+
+/* RESET3 */
+/* 96-127 */
+
+/* RESET4 */
+/* 128-131 */
+#define RESET_PWM_AB 132
+#define RESET_PWM_CD 133
+#define RESET_PWM_EF 134
+#define RESET_PWM_GH 135
+/* 136-137*/
+#define RESET_UART_A 138
+#define RESET_UART_B 139
+/* 140*/
+#define RESET_UART_D 141
+#define RESET_UART_E 142
+/* 143-144*/
+#define RESET_I2C_M_A 145
+#define RESET_I2C_M_B 146
+#define RESET_I2C_M_C 147
+#define RESET_I2C_M_D 148
+/* 149-151*/
+#define RESET_SDEMMC_A 152
+/* 153*/
+#define RESET_SDEMMC_C 154
+/* 155-159*/
+
+/* RESET5 */
+/* 160-175*/
+#define RESET_BRG_AO_NIC_SYS 176
+/* 177*/
+#define RESET_BRG_AO_NIC_MAIN 178
+#define RESET_BRG_AO_NIC_AUDIO 179
+/* 180-183*/
+#define RESET_BRG_AO_NIC_ALL 184
+/* 185*/
+#define RESET_BRG_NIC_SDIO 186
+#define RESET_BRG_NIC_EMMC 187
+#define RESET_BRG_NIC_DSU 188
+#define RESET_BRG_NIC_CLK81 189
+#define RESET_BRG_NIC_MAIN 190
+#define RESET_BRG_NIC_ALL 191
+
+#endif
diff --git a/arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi
index efba8565af3cf5298f894819572d78e0c0041f71..02365494d8655f8cf97f0ffdc9a9566e42ab61ae 100644
--- a/arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi
+++ b/arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi
@@ -4,6 +4,7 @@
*/
#include "amlogic-a4-common.dtsi"
+#include "amlogic-a4-reset.h"
#include <dt-bindings/power/amlogic,a4-pwrc.h>
#include <dt-bindings/pinctrl/amlogic,pinctrl.h>
/ {
@@ -51,6 +52,13 @@ pwrc: power-controller {
};
&apb {
+ reset: reset-controller@2000 {
+ compatible = "amlogic,a4-reset",
+ "amlogic,meson-s4-reset";
+ reg = <0x0 0x2000 0x0 0x98>;
+ #reset-cells = <1>;
+ };
+
periphs_pinctrl: pinctrl {
compatible = "amlogic,pinctrl-a4";
#address-cells = <2>;
--
2.37.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v4 2/3] arm64: dts: amlogic: Add A4 Reset Controller
2025-03-13 9:05 ` [PATCH v4 2/3] arm64: dts: amlogic: Add A4 " Kelvin Zhang via B4 Relay
@ 2025-03-14 8:01 ` Krzysztof Kozlowski
2025-03-17 2:49 ` Kelvin Zhang
0 siblings, 1 reply; 8+ messages in thread
From: Krzysztof Kozlowski @ 2025-03-14 8:01 UTC (permalink / raw)
To: Kelvin Zhang
Cc: Philipp Zabel, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Neil Armstrong, Kevin Hilman, Jerome Brunet, Martin Blumenstingl,
devicetree, linux-arm-kernel, linux-amlogic, linux-kernel,
Zelong Dong
On Thu, Mar 13, 2025 at 05:05:35PM +0800, Kelvin Zhang wrote:
> &apb {
> + reset: reset-controller@2000 {
> + compatible = "amlogic,a4-reset",
> + "amlogic,meson-s4-reset";
> + reg = <0x0 0x2000 0x0 0x98>;
> + #reset-cells = <1>;
> + };
> +
Why do you have on the bus devices with bus addressing and without it?
What sort of bus is it?
> periphs_pinctrl: pinctrl {
> compatible = "amlogic,pinctrl-a4";
> #address-cells = <2>;
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH v4 2/3] arm64: dts: amlogic: Add A4 Reset Controller
2025-03-14 8:01 ` Krzysztof Kozlowski
@ 2025-03-17 2:49 ` Kelvin Zhang
2025-03-17 7:28 ` Krzysztof Kozlowski
0 siblings, 1 reply; 8+ messages in thread
From: Kelvin Zhang @ 2025-03-17 2:49 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Philipp Zabel, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Neil Armstrong, Kevin Hilman, Jerome Brunet, Martin Blumenstingl,
devicetree, linux-arm-kernel, linux-amlogic, linux-kernel,
Zelong Dong
On 2025/3/14 16:01, Krzysztof Kozlowski wrote:
>
> On Thu, Mar 13, 2025 at 05:05:35PM +0800, Kelvin Zhang wrote:
>> &apb {
>> + reset: reset-controller@2000 {
>> + compatible = "amlogic,a4-reset",
>> + "amlogic,meson-s4-reset";
>> + reg = <0x0 0x2000 0x0 0x98>;
>> + #reset-cells = <1>;
>> + };
>> +
>
> Why do you have on the bus devices with bus addressing and without it?
> What sort of bus is it?
Are you referring to the 'apb'?
If so, the 'apb' bus is defined in
arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi.
apb: bus@fe000000 {
compatible = "simple-bus";
reg = <0x0 0xfe000000 0x0 0x480000>;
#address-cells = <2>;
#size-cells = <2>;
ranges = <0x0 0x0 0x0 0xfe000000 0x0 0x480000>;
>
>> periphs_pinctrl: pinctrl {
>> compatible = "amlogic,pinctrl-a4";
>> #address-cells = <2>;
>
> Best regards,
> Krzysztof
>
--
Best regards,
Kelvin Zhang
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH v4 2/3] arm64: dts: amlogic: Add A4 Reset Controller
2025-03-17 2:49 ` Kelvin Zhang
@ 2025-03-17 7:28 ` Krzysztof Kozlowski
2025-03-17 9:51 ` Xianwei Zhao
0 siblings, 1 reply; 8+ messages in thread
From: Krzysztof Kozlowski @ 2025-03-17 7:28 UTC (permalink / raw)
To: Kelvin Zhang
Cc: Philipp Zabel, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Neil Armstrong, Kevin Hilman, Jerome Brunet, Martin Blumenstingl,
devicetree, linux-arm-kernel, linux-amlogic, linux-kernel,
Zelong Dong
On 17/03/2025 03:49, Kelvin Zhang wrote:
>>
>> Why do you have on the bus devices with bus addressing and without it?
>> What sort of bus is it?
>
> Are you referring to the 'apb'?
> If so, the 'apb' bus is defined in
> arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi.
>
> apb: bus@fe000000 {
> compatible = "simple-bus";
> reg = <0x0 0xfe000000 0x0 0x480000>;
> #address-cells = <2>;
> #size-cells = <2>;
> ranges = <0x0 0x0 0x0 0xfe000000 0x0 0x480000>;
>
>>
>>> periphs_pinctrl: pinctrl {
Then what the heck is this?
>>> compatible = "amlogic,pinctrl-a4";
>>> #address-cells = <2>;
>>
>> Best regards,
>> Krzysztof
>>
>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH v4 2/3] arm64: dts: amlogic: Add A4 Reset Controller
2025-03-17 7:28 ` Krzysztof Kozlowski
@ 2025-03-17 9:51 ` Xianwei Zhao
0 siblings, 0 replies; 8+ messages in thread
From: Xianwei Zhao @ 2025-03-17 9:51 UTC (permalink / raw)
To: Krzysztof Kozlowski, Kelvin Zhang
Cc: Philipp Zabel, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Neil Armstrong, Kevin Hilman, Jerome Brunet, Martin Blumenstingl,
devicetree, linux-arm-kernel, linux-amlogic, linux-kernel,
Zelong Dong
Hi Krzysztof,
On 2025/3/17 15:28, Krzysztof Kozlowski wrote:
> [ EXTERNAL EMAIL ]
>
> On 17/03/2025 03:49, Kelvin Zhang wrote:
>>>
>>> Why do you have on the bus devices with bus addressing and without it?
>>> What sort of bus is it?
>>
>> Are you referring to the 'apb'?
>> If so, the 'apb' bus is defined in
>> arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi.
>>
>> apb: bus@fe000000 {
>> compatible = "simple-bus";
>> reg = <0x0 0xfe000000 0x0 0x480000>;
>> #address-cells = <2>;
>> #size-cells = <2>;
>> ranges = <0x0 0x0 0x0 0xfe000000 0x0 0x480000>;
>>
>>>
>>>> periphs_pinctrl: pinctrl {
>
> Then what the heck is this?
>
I will fix it and add the unit address to the pinctrl node.
>>>> compatible = "amlogic,pinctrl-a4";
>>>> #address-cells = <2>;
>>>
>>> Best regards,
>>> Krzysztof
>>>
>>
>
>
> Best regards,
> Krzysztof
>
> _______________________________________________
> linux-amlogic mailing list
> linux-amlogic@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v4 3/3] arm64: dts: amlogic: Add A5 Reset Controller
2025-03-13 9:05 [PATCH v4 0/3] Add support for Amlogic A4/A5 Reset Kelvin Zhang via B4 Relay
2025-03-13 9:05 ` [PATCH v4 1/3] dt-bindings: reset: Add compatible for Amlogic A4/A5 Reset Controller Kelvin Zhang via B4 Relay
2025-03-13 9:05 ` [PATCH v4 2/3] arm64: dts: amlogic: Add A4 " Kelvin Zhang via B4 Relay
@ 2025-03-13 9:05 ` Kelvin Zhang via B4 Relay
2 siblings, 0 replies; 8+ messages in thread
From: Kelvin Zhang via B4 Relay @ 2025-03-13 9:05 UTC (permalink / raw)
To: Philipp Zabel, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Neil Armstrong, Kevin Hilman, Jerome Brunet, Martin Blumenstingl
Cc: devicetree, linux-arm-kernel, linux-amlogic, linux-kernel,
Zelong Dong, Kelvin Zhang
From: Zelong Dong <zelong.dong@amlogic.com>
Add the device node and related header file for Amlogic
A5 reset controller.
Signed-off-by: Zelong Dong <zelong.dong@amlogic.com>
Link: https://lore.kernel.org/r/20240918074211.8067-4-zelong.dong@amlogic.com
Signed-off-by: Kelvin Zhang <kelvin.zhang@amlogic.com>
---
arch/arm64/boot/dts/amlogic/amlogic-a5-reset.h | 95 ++++++++++++++++++++++++++
arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi | 10 +++
2 files changed, 105 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/amlogic-a5-reset.h b/arch/arm64/boot/dts/amlogic/amlogic-a5-reset.h
new file mode 100644
index 0000000000000000000000000000000000000000..cdf0f515962097c606e4c53badb19df7d21606ec
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/amlogic-a5-reset.h
@@ -0,0 +1,95 @@
+/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */
+/*
+ * Copyright (c) 2024 Amlogic, Inc. All rights reserved.
+ */
+
+#ifndef __DTS_AMLOGIC_A5_RESET_H
+#define __DTS_AMLOGIC_A5_RESET_H
+
+/* RESET0 */
+/* 0-3 */
+#define RESET_USB 4
+/* 5-7 */
+#define RESET_USBPHY20 8
+/* 9 */
+#define RESET_USB2DRD 10
+/* 11-31 */
+
+/* RESET1 */
+#define RESET_AUDIO 32
+#define RESET_AUDIO_VAD 33
+/* 34 */
+#define RESET_DDR_APB 35
+#define RESET_DDR 36
+/* 37-40 */
+#define RESET_DSPA_DEBUG 41
+/* 42 */
+#define RESET_DSPA 43
+/* 44-46 */
+#define RESET_NNA 47
+#define RESET_ETHERNET 48
+/* 49-63 */
+
+/* RESET2 */
+#define RESET_ABUS_ARB 64
+#define RESET_IRCTRL 65
+/* 66 */
+#define RESET_TS_PLL 67
+/* 68-72 */
+#define RESET_SPICC_0 73
+#define RESET_SPICC_1 74
+#define RESET_RSA 75
+
+/* 76-79 */
+#define RESET_MSR_CLK 80
+#define RESET_SPIFC 81
+#define RESET_SAR_ADC 82
+/* 83-90 */
+#define RESET_WATCHDOG 91
+/* 92-95 */
+
+/* RESET3 */
+/* 96-127 */
+
+/* RESET4 */
+#define RESET_RTC 128
+/* 129-131 */
+#define RESET_PWM_AB 132
+#define RESET_PWM_CD 133
+#define RESET_PWM_EF 134
+#define RESET_PWM_GH 135
+/* 104-105 */
+#define RESET_UART_A 138
+#define RESET_UART_B 139
+#define RESET_UART_C 140
+#define RESET_UART_D 141
+#define RESET_UART_E 142
+/* 143*/
+#define RESET_I2C_S_A 144
+#define RESET_I2C_M_A 145
+#define RESET_I2C_M_B 146
+#define RESET_I2C_M_C 147
+#define RESET_I2C_M_D 148
+/* 149-151 */
+#define RESET_SDEMMC_A 152
+/* 153 */
+#define RESET_SDEMMC_C 154
+/* 155-159*/
+
+/* RESET5 */
+/* 160-175 */
+#define RESET_BRG_AO_NIC_SYS 176
+#define RESET_BRG_AO_NIC_DSPA 177
+#define RESET_BRG_AO_NIC_MAIN 178
+#define RESET_BRG_AO_NIC_AUDIO 179
+/* 180-183 */
+#define RESET_BRG_AO_NIC_ALL 184
+#define RESET_BRG_NIC_NNA 185
+#define RESET_BRG_NIC_SDIO 186
+#define RESET_BRG_NIC_EMMC 187
+#define RESET_BRG_NIC_DSU 188
+#define RESET_BRG_NIC_SYSCLK 189
+#define RESET_BRG_NIC_MAIN 190
+#define RESET_BRG_NIC_ALL 191
+
+#endif
diff --git a/arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi
index 17a6316de8918f31f3f7625f2eda06a60664139a..b97e2f3091bf62f4bdaaebeaf5d1dfe695cfc6d5 100644
--- a/arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi
+++ b/arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi
@@ -4,6 +4,7 @@
*/
#include "amlogic-a4-common.dtsi"
+#include "amlogic-a5-reset.h"
#include <dt-bindings/power/amlogic,a5-pwrc.h>
/ {
cpus {
@@ -48,3 +49,12 @@ pwrc: power-controller {
};
};
};
+
+&apb {
+ reset: reset-controller@2000 {
+ compatible = "amlogic,a5-reset",
+ "amlogic,meson-s4-reset";
+ reg = <0x0 0x2000 0x0 0x98>;
+ #reset-cells = <1>;
+ };
+};
--
2.37.1
^ permalink raw reply related [flat|nested] 8+ messages in thread