From: Zelong Dong <[email protected]>
This patchset adds Reset controller driver support for Amlogic C3 SoC.
The RESET registers count and offset for C3 Soc are same as S4 Soc.
Changes since v1:
- remove Change-ID
- run scripts/checkpatch.pl and fix reported warnings
- sort dts node by base reg offset
Changes since v2:
- replace keyword "meson" with "amlogic"
---
v1:https://lore.kernel.org/all/[email protected]/
v2:https://lore.kernel.org/all/[email protected]/
Zelong Dong (3):
dt-bindings: reset: Add compatible and DT bindings for Amlogic C3
Reset Controller
reset: reset-meson: add support for Amlogic C3 SoC Reset Controller
arm64: dts: amlogic: add reset controller for Amlogic C3 SoC
.../bindings/reset/amlogic,meson-reset.yaml | 1 +
arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 7 ++
drivers/reset/reset-meson.c | 1 +
include/dt-bindings/reset/amlogic,c3-reset.h | 119 ++++++++++++++++++
4 files changed, 128 insertions(+)
create mode 100644 include/dt-bindings/reset/amlogic,c3-reset.h
--
2.35.1
From: Zelong Dong <[email protected]>
Add the reset controller device of Amlogic C3 SoC family
Signed-off-by: Zelong Dong <[email protected]>
---
arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
index 60ad4f3eef9d..28698c42e11e 100644
--- a/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
+++ b/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
@@ -6,6 +6,7 @@
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/reset/amlogic,c3-reset.h>
/ {
cpus {
@@ -72,6 +73,12 @@ apb4: bus@fe000000 {
#size-cells = <2>;
ranges = <0x0 0x0 0x0 0xfe000000 0x0 0x480000>;
+ reset: reset-controller@2000 {
+ compatible = "amlogic,c3-reset";
+ reg = <0x0 0x2000 0x0 0x98>;
+ #reset-cells = <1>;
+ };
+
uart_b: serial@7a000 {
compatible = "amlogic,meson-s4-uart",
"amlogic,meson-ao-uart";
--
2.35.1
From: Zelong Dong <[email protected]>
Add new compatible and DT bindings for Amlogic C3 Reset Controller
Signed-off-by: Zelong Dong <[email protected]>
---
.../bindings/reset/amlogic,meson-reset.yaml | 1 +
include/dt-bindings/reset/amlogic,c3-reset.h | 119 ++++++++++++++++++
2 files changed, 120 insertions(+)
create mode 100644 include/dt-bindings/reset/amlogic,c3-reset.h
diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
index d3fdee89d4f8..f0c6c0df0ce3 100644
--- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
+++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
@@ -18,6 +18,7 @@ properties:
- 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
reg:
maxItems: 1
diff --git a/include/dt-bindings/reset/amlogic,c3-reset.h b/include/dt-bindings/reset/amlogic,c3-reset.h
new file mode 100644
index 000000000000..d9127863f603
--- /dev/null
+++ b/include/dt-bindings/reset/amlogic,c3-reset.h
@@ -0,0 +1,119 @@
+/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */
+/*
+ * Copyright (c) 2023 Amlogic, Inc. All rights reserved.
+ */
+
+#ifndef _DT_BINDINGS_AMLOGIC_C3_RESET_H
+#define _DT_BINDINGS_AMLOGIC_C3_RESET_H
+
+/* RESET0 */
+/* 0-3 */
+#define RESET_USBCTRL 4
+/* 5-7 */
+#define RESET_USBPHY20 8
+/* 9 */
+#define RESET_USB2DRD 10
+#define RESET_MIPI_DSI_HOST 11
+#define RESET_MIPI_DSI_PHY 12
+/* 13-20 */
+#define RESET_GE2D 21
+#define RESET_DWAP 22
+/* 23-31 */
+
+/* RESET1 */
+#define RESET_AUDIO 32
+/* 33-34 */
+#define RESET_DDRAPB 35
+#define RESET_DDR 36
+#define RESET_DOS_CAPB3 37
+#define RESET_DOS 38
+/* 39-46 */
+#define RESET_NNA 47
+#define RESET_ETHERNET 48
+#define RESET_ISP 49
+#define RESET_VC9000E_APB 50
+#define RESET_VC9000E_A 51
+/* 52 */
+#define RESET_VC9000E_CORE 53
+/* 54-63 */
+
+/* RESET2 */
+#define RESET_ABUS_ARB 64
+#define RESET_IRCTRL 65
+/* 66 */
+#define RESET_TEMP_PII 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-87 */
+#define RESET_ACODEC 88
+/* 89-90 */
+#define RESET_WATCHDOG 91
+/* 92-95 */
+
+/* RESET3 */
+#define RESET_ISP_NIC_GPV 96
+#define RESET_ISP_NIC_MAIN 97
+#define RESET_ISP_NIC_VCLK 98
+#define RESET_ISP_NIC_VOUT 99
+#define RESET_ISP_NIC_ALL 100
+#define RESET_VOUT 101
+#define RESET_VOUT_VENC 102
+/* 103 */
+#define RESET_CVE_NIC_GPV 104
+#define RESET_CVE_NIC_MAIN 105
+#define RESET_CVE_NIC_GE2D 106
+#define RESET_CVE_NIC_DW 106
+#define RESET_CVE_NIC_CVE 108
+#define RESET_CVE_NIC_ALL 109
+#define RESET_CVE 110
+/* 112-127 */
+
+/* RESET4 */
+#define RESET_RTC 128
+#define RESET_PWM_AB 129
+#define RESET_PWM_CD 130
+#define RESET_PWM_EF 131
+#define RESET_PWM_GH 132
+#define RESET_PWM_IJ 133
+#define RESET_PWM_KL 134
+#define RESET_PWM_MN 135
+/* 136-137 */
+#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
+#define RESET_UART_F 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_SD_EMMC_A 152
+#define RESET_SD_EMMC_B 153
+#define RESET_SD_EMMC_C 154
+
+/* RESET5 */
+/* 160-172 */
+#define RESET_BRG_NIC_NNA 173
+#define RESET_BRG_MUX_NIC_MAIN 174
+#define RESET_BRG_AO_NIC_ALL 175
+/* 176-183 */
+#define RESET_BRG_NIC_VAPB 184
+#define RESET_BRG_NIC_SDIO_B 185
+#define RESET_BRG_NIC_SDIO_A 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
--
2.35.1
From: Zelong Dong <[email protected]>
Add a new compatible string to support for the reset controller
on the C3 SoC. The count and offset for C3 Soc RESET registers are
same as S4 Soc.
Signed-off-by: Zelong Dong <[email protected]>
Reviewed-by: Dmitry Rokosov <[email protected]>
Reviewed-by: Martin Blumenstingl <[email protected]>
---
drivers/reset/reset-meson.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
index 13878ca2779d..861b9d1b1469 100644
--- a/drivers/reset/reset-meson.c
+++ b/drivers/reset/reset-meson.c
@@ -109,6 +109,7 @@ static const struct of_device_id meson_reset_dt_ids[] = {
{ .compatible = "amlogic,meson-axg-reset", .data = &meson8b_param},
{ .compatible = "amlogic,meson-a1-reset", .data = &meson_a1_param},
{ .compatible = "amlogic,meson-s4-reset", .data = &meson_s4_param},
+ { .compatible = "amlogic,c3-reset", .data = &meson_s4_param},
{ /* sentinel */ },
};
MODULE_DEVICE_TABLE(of, meson_reset_dt_ids);
--
2.35.1
On 19/07/2023 08:09, zelong dong wrote:
> From: Zelong Dong <[email protected]>
>
> Add new compatible and DT bindings for Amlogic C3 Reset Controller
>
> Signed-off-by: Zelong Dong <[email protected]>
Acked-by: Krzysztof Kozlowski <[email protected]>
Best regards,
Krzysztof
On Wed, Jul 19, 2023 at 02:09:52PM +0800, zelong dong wrote:
> From: Zelong Dong <[email protected]>
>
> Add new compatible and DT bindings for Amlogic C3 Reset Controller
>
> Signed-off-by: Zelong Dong <[email protected]>
> ---
> .../bindings/reset/amlogic,meson-reset.yaml | 1 +
> include/dt-bindings/reset/amlogic,c3-reset.h | 119 ++++++++++++++++++
> 2 files changed, 120 insertions(+)
As I understand it, updates to DT bindings documentation, as well as any
DT bindings includes, should be submitted in separate patches, per the
guidelines outlined in the following link:
https://www.kernel.org/doc/html/latest/devicetree/bindings/submitting-patches.html#i-for-patch-submitters.
Krzysztof, Rob, and Conor, please correct me if I am mistaken.
> create mode 100644 include/dt-bindings/reset/amlogic,c3-reset.h
>
> diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
> index d3fdee89d4f8..f0c6c0df0ce3 100644
> --- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
> +++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
> @@ -18,6 +18,7 @@ properties:
> - 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
>
> reg:
> maxItems: 1
> diff --git a/include/dt-bindings/reset/amlogic,c3-reset.h b/include/dt-bindings/reset/amlogic,c3-reset.h
> new file mode 100644
> index 000000000000..d9127863f603
> --- /dev/null
> +++ b/include/dt-bindings/reset/amlogic,c3-reset.h
> @@ -0,0 +1,119 @@
> +/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */
> +/*
> + * Copyright (c) 2023 Amlogic, Inc. All rights reserved.
> + */
> +
> +#ifndef _DT_BINDINGS_AMLOGIC_C3_RESET_H
> +#define _DT_BINDINGS_AMLOGIC_C3_RESET_H
> +
> +/* RESET0 */
> +/* 0-3 */
> +#define RESET_USBCTRL 4
> +/* 5-7 */
> +#define RESET_USBPHY20 8
> +/* 9 */
> +#define RESET_USB2DRD 10
> +#define RESET_MIPI_DSI_HOST 11
> +#define RESET_MIPI_DSI_PHY 12
> +/* 13-20 */
> +#define RESET_GE2D 21
> +#define RESET_DWAP 22
> +/* 23-31 */
> +
> +/* RESET1 */
> +#define RESET_AUDIO 32
> +/* 33-34 */
> +#define RESET_DDRAPB 35
> +#define RESET_DDR 36
> +#define RESET_DOS_CAPB3 37
> +#define RESET_DOS 38
> +/* 39-46 */
> +#define RESET_NNA 47
> +#define RESET_ETHERNET 48
> +#define RESET_ISP 49
> +#define RESET_VC9000E_APB 50
> +#define RESET_VC9000E_A 51
> +/* 52 */
> +#define RESET_VC9000E_CORE 53
> +/* 54-63 */
> +
> +/* RESET2 */
> +#define RESET_ABUS_ARB 64
> +#define RESET_IRCTRL 65
> +/* 66 */
> +#define RESET_TEMP_PII 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-87 */
> +#define RESET_ACODEC 88
> +/* 89-90 */
> +#define RESET_WATCHDOG 91
> +/* 92-95 */
> +
> +/* RESET3 */
> +#define RESET_ISP_NIC_GPV 96
> +#define RESET_ISP_NIC_MAIN 97
> +#define RESET_ISP_NIC_VCLK 98
> +#define RESET_ISP_NIC_VOUT 99
> +#define RESET_ISP_NIC_ALL 100
> +#define RESET_VOUT 101
> +#define RESET_VOUT_VENC 102
> +/* 103 */
> +#define RESET_CVE_NIC_GPV 104
> +#define RESET_CVE_NIC_MAIN 105
> +#define RESET_CVE_NIC_GE2D 106
> +#define RESET_CVE_NIC_DW 106
> +#define RESET_CVE_NIC_CVE 108
> +#define RESET_CVE_NIC_ALL 109
> +#define RESET_CVE 110
> +/* 112-127 */
> +
> +/* RESET4 */
> +#define RESET_RTC 128
> +#define RESET_PWM_AB 129
> +#define RESET_PWM_CD 130
> +#define RESET_PWM_EF 131
> +#define RESET_PWM_GH 132
> +#define RESET_PWM_IJ 133
> +#define RESET_PWM_KL 134
> +#define RESET_PWM_MN 135
> +/* 136-137 */
> +#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
> +#define RESET_UART_F 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_SD_EMMC_A 152
> +#define RESET_SD_EMMC_B 153
> +#define RESET_SD_EMMC_C 154
> +
> +/* RESET5 */
> +/* 160-172 */
> +#define RESET_BRG_NIC_NNA 173
> +#define RESET_BRG_MUX_NIC_MAIN 174
> +#define RESET_BRG_AO_NIC_ALL 175
> +/* 176-183 */
> +#define RESET_BRG_NIC_VAPB 184
> +#define RESET_BRG_NIC_SDIO_B 185
> +#define RESET_BRG_NIC_SDIO_A 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
> --
> 2.35.1
>
>
> _______________________________________________
> linux-amlogic mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-amlogic
--
Thank you,
Dmitry
On Wed, Jul 19, 2023 at 02:09:54PM +0800, zelong dong wrote:
> From: Zelong Dong <[email protected]>
>
> Add the reset controller device of Amlogic C3 SoC family
>
> Signed-off-by: Zelong Dong <[email protected]>
Reviewed-by: Dmitry Rokosov <[email protected]>
> ---
> arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
> index 60ad4f3eef9d..28698c42e11e 100644
> --- a/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
> @@ -6,6 +6,7 @@
> #include <dt-bindings/interrupt-controller/irq.h>
> #include <dt-bindings/interrupt-controller/arm-gic.h>
> #include <dt-bindings/gpio/gpio.h>
> +#include <dt-bindings/reset/amlogic,c3-reset.h>
>
> / {
> cpus {
> @@ -72,6 +73,12 @@ apb4: bus@fe000000 {
> #size-cells = <2>;
> ranges = <0x0 0x0 0x0 0xfe000000 0x0 0x480000>;
>
> + reset: reset-controller@2000 {
> + compatible = "amlogic,c3-reset";
> + reg = <0x0 0x2000 0x0 0x98>;
> + #reset-cells = <1>;
> + };
> +
> uart_b: serial@7a000 {
> compatible = "amlogic,meson-s4-uart",
> "amlogic,meson-ao-uart";
> --
> 2.35.1
>
>
> _______________________________________________
> linux-amlogic mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-amlogic
--
Thank you,
Dmitry
On 19/07/2023 13:50, Dmitry Rokosov wrote:
> On Wed, Jul 19, 2023 at 02:09:52PM +0800, zelong dong wrote:
>> From: Zelong Dong <[email protected]>
>>
>> Add new compatible and DT bindings for Amlogic C3 Reset Controller
>>
>> Signed-off-by: Zelong Dong <[email protected]>
>> ---
>> .../bindings/reset/amlogic,meson-reset.yaml | 1 +
>> include/dt-bindings/reset/amlogic,c3-reset.h | 119 ++++++++++++++++++
>> 2 files changed, 120 insertions(+)
>
> As I understand it, updates to DT bindings documentation, as well as any
> DT bindings includes, should be submitted in separate patches, per the
> guidelines outlined in the following link:
> https://www.kernel.org/doc/html/latest/devicetree/bindings/submitting-patches.html#i-for-patch-submitters.
>
> Krzysztof, Rob, and Conor, please correct me if I am mistaken.
And they are. What's wrong here?
Best regards,
Krzysztof
On Wed, Jul 19, 2023 at 02:33:03PM +0200, Krzysztof Kozlowski wrote:
> On 19/07/2023 13:50, Dmitry Rokosov wrote:
> > On Wed, Jul 19, 2023 at 02:09:52PM +0800, zelong dong wrote:
> >> From: Zelong Dong <[email protected]>
> >>
> >> Add new compatible and DT bindings for Amlogic C3 Reset Controller
> >>
> >> Signed-off-by: Zelong Dong <[email protected]>
> >> ---
> >> .../bindings/reset/amlogic,meson-reset.yaml | 1 +
> >> include/dt-bindings/reset/amlogic,c3-reset.h | 119 ++++++++++++++++++
> >> 2 files changed, 120 insertions(+)
> >
> > As I understand it, updates to DT bindings documentation, as well as any
> > DT bindings includes, should be submitted in separate patches, per the
> > guidelines outlined in the following link:
> > https://www.kernel.org/doc/html/latest/devicetree/bindings/submitting-patches.html#i-for-patch-submitters.
> >
> > Krzysztof, Rob, and Conor, please correct me if I am mistaken.
>
> And they are. What's wrong here?
Please accept my apologies for any confusion caused. Initially, I
misunderstood that YAML documentation and device tree bindings includes
should be kept separate.
As such, this patch includes modifications to both areas, namely
bindings documentation and include/dt-bindings, but all of them are
separate from driver part.
In this case,
Reviewed-by: Dmitry Rokosov <[email protected]>
--
Thank you,
Dmitry
On Mi, 2023-07-19 at 14:09 +0800, zelong dong wrote:
> From: Zelong Dong <[email protected]>
>
> Add new compatible and DT bindings for Amlogic C3 Reset Controller
>
> Signed-off-by: Zelong Dong <[email protected]>
> ---
> .../bindings/reset/amlogic,meson-reset.yaml | 1 +
> include/dt-bindings/reset/amlogic,c3-reset.h | 119 ++++++++++++++++++
> 2 files changed, 120 insertions(+)
> create mode 100644 include/dt-bindings/reset/amlogic,c3-reset.h
>
> diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
> index d3fdee89d4f8..f0c6c0df0ce3 100644
> --- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
> +++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
> @@ -18,6 +18,7 @@ properties:
> - 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
>
> reg:
> maxItems: 1
> diff --git a/include/dt-bindings/reset/amlogic,c3-reset.h b/include/dt-bindings/reset/amlogic,c3-reset.h
> new file mode 100644
> index 000000000000..d9127863f603
> --- /dev/null
> +++ b/include/dt-bindings/reset/amlogic,c3-reset.h
Given that this is only included by
arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi, should this header be
moved to arch/arm64/boot/dts/amlogic ?
regards
Philipp
On 28/07/2023 17:49, Philipp Zabel wrote:
>> maxItems: 1
>> diff --git a/include/dt-bindings/reset/amlogic,c3-reset.h b/include/dt-bindings/reset/amlogic,c3-reset.h
>> new file mode 100644
>> index 000000000000..d9127863f603
>> --- /dev/null
>> +++ b/include/dt-bindings/reset/amlogic,c3-reset.h
>
> Given that this is only included by
> arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi, should this header be
> moved to arch/arm64/boot/dts/amlogic ?
I think there is ongoing work or at least plan to use the IDs also in
clock/reset drivers for all Amlogic platforms. Do I recall this correctly?
Best regards,
Krzysztof
On 31/07/2023 10:08, Neil Armstrong wrote:
> On 28/07/2023 18:40, Krzysztof Kozlowski wrote:
>> On 28/07/2023 17:49, Philipp Zabel wrote:
>>>> maxItems: 1
>>>> diff --git a/include/dt-bindings/reset/amlogic,c3-reset.h b/include/dt-bindings/reset/amlogic,c3-reset.h
>>>> new file mode 100644
>>>> index 000000000000..d9127863f603
>>>> --- /dev/null
>>>> +++ b/include/dt-bindings/reset/amlogic,c3-reset.h
>>>
>>> Given that this is only included by
>>> arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi, should this header be
>>> moved to arch/arm64/boot/dts/amlogic ?
>>
>> I think there is ongoing work or at least plan to use the IDs also in
>> clock/reset drivers for all Amlogic platforms. Do I recall this correctly?
>
> Yes the header is used in DT and the driver, so it's in the right place.
Forget my comment, wrong patchset...
Neil
>
> Neil
>
>>
>> Best regards,
>> Krzysztof
>>
>
On 28/07/2023 18:40, Krzysztof Kozlowski wrote:
> On 28/07/2023 17:49, Philipp Zabel wrote:
>>> maxItems: 1
>>> diff --git a/include/dt-bindings/reset/amlogic,c3-reset.h b/include/dt-bindings/reset/amlogic,c3-reset.h
>>> new file mode 100644
>>> index 000000000000..d9127863f603
>>> --- /dev/null
>>> +++ b/include/dt-bindings/reset/amlogic,c3-reset.h
>>
>> Given that this is only included by
>> arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi, should this header be
>> moved to arch/arm64/boot/dts/amlogic ?
>
> I think there is ongoing work or at least plan to use the IDs also in
> clock/reset drivers for all Amlogic platforms. Do I recall this correctly?
Yes the header is used in DT and the driver, so it's in the right place.
Neil
>
> Best regards,
> Krzysztof
>
On 28/07/2023 17:49, Philipp Zabel wrote:
> On Mi, 2023-07-19 at 14:09 +0800, zelong dong wrote:
>> From: Zelong Dong <[email protected]>
>>
>> Add new compatible and DT bindings for Amlogic C3 Reset Controller
>>
>> Signed-off-by: Zelong Dong <[email protected]>
>> ---
>> .../bindings/reset/amlogic,meson-reset.yaml | 1 +
>> include/dt-bindings/reset/amlogic,c3-reset.h | 119 ++++++++++++++++++
>> 2 files changed, 120 insertions(+)
>> create mode 100644 include/dt-bindings/reset/amlogic,c3-reset.h
>>
>> diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
>> index d3fdee89d4f8..f0c6c0df0ce3 100644
>> --- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
>> +++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
>> @@ -18,6 +18,7 @@ properties:
>> - 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
>>
>> reg:
>> maxItems: 1
>> diff --git a/include/dt-bindings/reset/amlogic,c3-reset.h b/include/dt-bindings/reset/amlogic,c3-reset.h
>> new file mode 100644
>> index 000000000000..d9127863f603
>> --- /dev/null
>> +++ b/include/dt-bindings/reset/amlogic,c3-reset.h
>
> Given that this is only included by
> arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi, should this header be
> moved to arch/arm64/boot/dts/amlogic ?
Maybe I missed something, but since when should we move bindings headers to arch/xxx/boot/dts/vendor ?
Neil
>
> regards
> Philipp
在 2023/7/29 0:40, Krzysztof Kozlowski 写道:
> On 28/07/2023 17:49, Philipp Zabel wrote:
>>> maxItems: 1
>>> diff --git a/include/dt-bindings/reset/amlogic,c3-reset.h b/include/dt-bindings/reset/amlogic,c3-reset.h
>>> new file mode 100644
>>> index 000000000000..d9127863f603
>>> --- /dev/null
>>> +++ b/include/dt-bindings/reset/amlogic,c3-reset.h
>>
>> Given that this is only included by
>> arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi, should this header be
>> moved to arch/arm64/boot/dts/amlogic ?
>
> I think there is ongoing work or at least plan to use the IDs also in
> clock/reset drivers for all Amlogic platforms. Do I recall this correctly?
>
> Best regards,
> Krzysztof
>
So far, Amlogic reset headers are only included by DTS, reset driver
will not include these.
Should I move all the headers (include/dt-bindings/reset/amlogic,*.h) to
arch/arm64/boot/dts/amlogic ?
在 2023/7/31 17:17, Neil Armstrong 写道:
> On 28/07/2023 17:49, Philipp Zabel wrote:
>> On Mi, 2023-07-19 at 14:09 +0800, zelong dong wrote:
>>> From: Zelong Dong <[email protected]>
>>>
>>> Add new compatible and DT bindings for Amlogic C3 Reset Controller
>>>
>>> Signed-off-by: Zelong Dong <[email protected]>
>>> ---
>>> .../bindings/reset/amlogic,meson-reset.yaml | 1 +
>>> include/dt-bindings/reset/amlogic,c3-reset.h | 119 ++++++++++++++++++
>>> 2 files changed, 120 insertions(+)
>>> create mode 100644 include/dt-bindings/reset/amlogic,c3-reset.h
>>>
>>> diff --git
>>> a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
>>> b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
>>> index d3fdee89d4f8..f0c6c0df0ce3 100644
>>> --- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
>>> +++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
>>> @@ -18,6 +18,7 @@ properties:
>>> - 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
>>>
>>> reg:
>>> maxItems: 1
>>> diff --git a/include/dt-bindings/reset/amlogic,c3-reset.h
>>> b/include/dt-bindings/reset/amlogic,c3-reset.h
>>> new file mode 100644
>>> index 000000000000..d9127863f603
>>> --- /dev/null
>>> +++ b/include/dt-bindings/reset/amlogic,c3-reset.h
>>
>> Given that this is only included by
>> arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi, should this header be
>> moved to arch/arm64/boot/dts/amlogic ?
>
> Maybe I missed something, but since when should we move bindings headers
> to arch/xxx/boot/dts/vendor ?
>
> Neil
>
>>
>> regards
>> Philipp
>
Hi,
It's been a while, how will we deal with this patch ?
Should we let this patch apply first? If Amlogic reset bindings headers
need to be moved to arch/xxx/boot/dts/vendor, could we apply it in a
separate change?
Hi,
On 12/09/2023 08:37, Zelong Dong wrote:
> 在 2023/7/31 17:17, Neil Armstrong 写道:
>> On 28/07/2023 17:49, Philipp Zabel wrote:
>>> On Mi, 2023-07-19 at 14:09 +0800, zelong dong wrote:
>>>> From: Zelong Dong <[email protected]>
>>>>
>>>> Add new compatible and DT bindings for Amlogic C3 Reset Controller
>>>>
>>>> Signed-off-by: Zelong Dong <[email protected]>
>>>> ---
>>>> .../bindings/reset/amlogic,meson-reset.yaml | 1 +
>>>> include/dt-bindings/reset/amlogic,c3-reset.h | 119 ++++++++++++++++++
>>>> 2 files changed, 120 insertions(+)
>>>> create mode 100644 include/dt-bindings/reset/amlogic,c3-reset.h
>>>>
>>>> diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
>>>> index d3fdee89d4f8..f0c6c0df0ce3 100644
>>>> --- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
>>>> +++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
>>>> @@ -18,6 +18,7 @@ properties:
>>>> - 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
>>>>
>>>> reg:
>>>> maxItems: 1
>>>> diff --git a/include/dt-bindings/reset/amlogic,c3-reset.h b/include/dt-bindings/reset/amlogic,c3-reset.h
>>>> new file mode 100644
>>>> index 000000000000..d9127863f603
>>>> --- /dev/null
>>>> +++ b/include/dt-bindings/reset/amlogic,c3-reset.h
>>>
>>> Given that this is only included by
>>> arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi, should this header be
>>> moved to arch/arm64/boot/dts/amlogic ?
>>
>> Maybe I missed something, but since when should we move bindings headers to arch/xxx/boot/dts/vendor ?
>>
>> Neil
>>
>>>
>>> regards
>>> Philipp
>>
> Hi,
> It's been a while, how will we deal with this patch ?
> Should we let this patch apply first? If Amlogic reset bindings headers need to be moved to arch/xxx/boot/dts/vendor, could we apply it in a separate change?
Please rebase on v6.6-rc1 and resend with all review/ack tags collected.
I still don't understand why the bindings header should go into arch/xxx/boot/dts/vendor.
Neil