* [PATCH 1/3] dt-bindings: reset: Add compatible for Meson-S4 Reset Controller
2022-01-07 2:39 [PATCH 0/3] reset: meson-s4: add reset driver Zelong Dong
@ 2022-01-07 2:39 ` Zelong Dong
2022-01-07 21:56 ` Martin Blumenstingl
2022-01-12 1:48 ` Rob Herring
2022-01-07 2:39 ` [PATCH 2/3] dt-bindings: reset: add bindings for the Meson-S4 SoC " Zelong Dong
` (2 subsequent siblings)
3 siblings, 2 replies; 10+ messages in thread
From: Zelong Dong @ 2022-01-07 2:39 UTC (permalink / raw)
To: p.zabel, robh+dt, khilman, narmstrong, martin.blumenstingl
Cc: linux-amlogic, linux-kernel, linux-arm-kernel, jbrunet,
devicetree, Zelong Dong
Add new compatible for Amlogic's Meson-S4 Reset Controller
Signed-off-by: Zelong Dong <zelong.dong@amlogic.com>
---
Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
index 92922d3afd14..494a454928ce 100644
--- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
+++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
@@ -17,6 +17,7 @@ properties:
- 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
reg:
maxItems: 1
--
2.34.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 1/3] dt-bindings: reset: Add compatible for Meson-S4 Reset Controller
2022-01-07 2:39 ` [PATCH 1/3] dt-bindings: reset: Add compatible for Meson-S4 Reset Controller Zelong Dong
@ 2022-01-07 21:56 ` Martin Blumenstingl
2022-01-12 1:48 ` Rob Herring
1 sibling, 0 replies; 10+ messages in thread
From: Martin Blumenstingl @ 2022-01-07 21:56 UTC (permalink / raw)
To: Zelong Dong
Cc: p.zabel, robh+dt, khilman, Neil Armstrong, linux-amlogic,
linux-kernel, linux-arm-kernel, jbrunet, devicetree
On Fri, Jan 7, 2022 at 3:40 AM Zelong Dong <zelong.dong@amlogic.com> wrote:
>
> Add new compatible for Amlogic's Meson-S4 Reset Controller
>
> Signed-off-by: Zelong Dong <zelong.dong@amlogic.com>
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] dt-bindings: reset: Add compatible for Meson-S4 Reset Controller
2022-01-07 2:39 ` [PATCH 1/3] dt-bindings: reset: Add compatible for Meson-S4 Reset Controller Zelong Dong
2022-01-07 21:56 ` Martin Blumenstingl
@ 2022-01-12 1:48 ` Rob Herring
1 sibling, 0 replies; 10+ messages in thread
From: Rob Herring @ 2022-01-12 1:48 UTC (permalink / raw)
To: Zelong Dong
Cc: devicetree, jbrunet, khilman, linux-amlogic, linux-kernel,
narmstrong, linux-arm-kernel, p.zabel, robh+dt,
martin.blumenstingl
On Fri, 07 Jan 2022 10:39:29 +0800, Zelong Dong wrote:
> Add new compatible for Amlogic's Meson-S4 Reset Controller
>
> Signed-off-by: Zelong Dong <zelong.dong@amlogic.com>
> ---
> Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml | 1 +
> 1 file changed, 1 insertion(+)
>
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 2/3] dt-bindings: reset: add bindings for the Meson-S4 SoC Reset Controller
2022-01-07 2:39 [PATCH 0/3] reset: meson-s4: add reset driver Zelong Dong
2022-01-07 2:39 ` [PATCH 1/3] dt-bindings: reset: Add compatible for Meson-S4 Reset Controller Zelong Dong
@ 2022-01-07 2:39 ` Zelong Dong
2022-01-07 21:57 ` Martin Blumenstingl
2022-01-10 17:36 ` Rob Herring
2022-01-07 2:39 ` [PATCH 3/3] reset: reset-meson: add support " Zelong Dong
2022-04-04 10:17 ` [PATCH 0/3] reset: meson-s4: add reset driver Philipp Zabel
3 siblings, 2 replies; 10+ messages in thread
From: Zelong Dong @ 2022-01-07 2:39 UTC (permalink / raw)
To: p.zabel, robh+dt, khilman, narmstrong, martin.blumenstingl
Cc: linux-amlogic, linux-kernel, linux-arm-kernel, jbrunet,
devicetree, Zelong Dong
Add DT bindings for the Meson-S4 SoC Reset Controller include file.
Signed-off-by: Zelong Dong <zelong.dong@amlogic.com>
---
.../reset/amlogic,meson-s4-reset.h | 125 ++++++++++++++++++
1 file changed, 125 insertions(+)
create mode 100644 include/dt-bindings/reset/amlogic,meson-s4-reset.h
diff --git a/include/dt-bindings/reset/amlogic,meson-s4-reset.h b/include/dt-bindings/reset/amlogic,meson-s4-reset.h
new file mode 100644
index 000000000000..eab428eb8ad6
--- /dev/null
+++ b/include/dt-bindings/reset/amlogic,meson-s4-reset.h
@@ -0,0 +1,125 @@
+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+/*
+ * Copyright (c) 2021 Amlogic, Inc. All rights reserved.
+ * Author: Zelong Dong <zelong.dong@amlogic.com>
+ *
+ */
+
+#ifndef _DT_BINDINGS_AMLOGIC_MESON_S4_RESET_H
+#define _DT_BINDINGS_AMLOGIC_MESON_S4_RESET_H
+
+/* RESET0 */
+#define RESET_USB_DDR0 0
+#define RESET_USB_DDR1 1
+#define RESET_USB_DDR2 2
+#define RESET_USB_DDR3 3
+#define RESET_USBCTRL 4
+/* 5-7 */
+#define RESET_USBPHY20 8
+#define RESET_USBPHY21 9
+/* 10-15 */
+#define RESET_HDMITX_APB 16
+#define RESET_BRG_VCBUS_DEC 17
+#define RESET_VCBUS 18
+#define RESET_VID_PLL_DIV 19
+#define RESET_VDI6 20
+#define RESET_GE2D 21
+#define RESET_HDMITXPHY 22
+#define RESET_VID_LOCK 23
+#define RESET_VENCL 24
+#define RESET_VDAC 25
+#define RESET_VENCP 26
+#define RESET_VENCI 27
+#define RESET_RDMA 28
+#define RESET_HDMI_TX 29
+#define RESET_VIU 30
+#define RESET_VENC 31
+
+/* RESET1 */
+#define RESET_AUDIO 32
+#define RESET_MALI_APB 33
+#define RESET_MALI 34
+#define RESET_DDR_APB 35
+#define RESET_DDR 36
+#define RESET_DOS_APB 37
+#define RESET_DOS 38
+/* 39-47 */
+#define RESET_ETH 48
+/* 49-51 */
+#define RESET_DEMOD 52
+/* 53-63 */
+
+/* RESET2 */
+#define RESET_ABUS_ARB 64
+#define RESET_IR_CTRL 65
+#define RESET_TEMPSENSOR_DDR 66
+#define RESET_TEMPSENSOR_PLL 67
+/* 68-71 */
+#define RESET_SMART_CARD 72
+#define RESET_SPICC0 73
+/* 74 */
+#define RESET_RSA 75
+/* 76-79 */
+#define RESET_MSR_CLK 80
+#define RESET_SPIFC 81
+#define RESET_SARADC 82
+/* 83-87 */
+#define RESET_ACODEC 88
+#define RESET_CEC 89
+#define RESET_AFIFO 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
+#define RESET_PWM_IJ 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
+/* 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
+#define RESET_I2C_M_E 149
+/* 150-151 */
+#define RESET_SD_EMMC_A 152
+#define RESET_SD_EMMC_B 153
+#define RESET_NAND_EMMC 154
+/* 155-159 */
+
+/* RESET5 */
+#define RESET_BRG_VDEC_PIPL0 160
+#define RESET_BRG_HEVCF_PIPL0 161
+/* 162 */
+#define RESET_BRG_HCODEC_PIPL0 163
+#define RESET_BRG_GE2D_PIPL0 164
+#define RESET_BRG_VPU_PIPL0 165
+#define RESET_BRG_CPU_PIPL0 166
+#define RESET_BRG_MALI_PIPL0 167
+/* 168 */
+#define RESET_BRG_MALI_PIPL1 169
+/* 170-171 */
+#define RESET_BRG_HEVCF_PIPL1 172
+#define RESET_BRG_HEVCB_PIPL1 173
+/* 174-183 */
+#define RESET_RAMA 184
+/* 185-186 */
+#define RESET_BRG_NIC_VAPB 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.34.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 2/3] dt-bindings: reset: add bindings for the Meson-S4 SoC Reset Controller
2022-01-07 2:39 ` [PATCH 2/3] dt-bindings: reset: add bindings for the Meson-S4 SoC " Zelong Dong
@ 2022-01-07 21:57 ` Martin Blumenstingl
2022-01-10 17:36 ` Rob Herring
1 sibling, 0 replies; 10+ messages in thread
From: Martin Blumenstingl @ 2022-01-07 21:57 UTC (permalink / raw)
To: Zelong Dong
Cc: p.zabel, robh+dt, khilman, Neil Armstrong, linux-amlogic,
linux-kernel, linux-arm-kernel, jbrunet, devicetree
On Fri, Jan 7, 2022 at 3:40 AM Zelong Dong <zelong.dong@amlogic.com> wrote:
>
> Add DT bindings for the Meson-S4 SoC Reset Controller include file.
>
> Signed-off-by: Zelong Dong <zelong.dong@amlogic.com>
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/3] dt-bindings: reset: add bindings for the Meson-S4 SoC Reset Controller
2022-01-07 2:39 ` [PATCH 2/3] dt-bindings: reset: add bindings for the Meson-S4 SoC " Zelong Dong
2022-01-07 21:57 ` Martin Blumenstingl
@ 2022-01-10 17:36 ` Rob Herring
1 sibling, 0 replies; 10+ messages in thread
From: Rob Herring @ 2022-01-10 17:36 UTC (permalink / raw)
To: Zelong Dong
Cc: jbrunet, linux-arm-kernel, narmstrong, robh+dt, linux-amlogic,
devicetree, linux-kernel, p.zabel, khilman, martin.blumenstingl
On Fri, 07 Jan 2022 10:39:30 +0800, Zelong Dong wrote:
> Add DT bindings for the Meson-S4 SoC Reset Controller include file.
>
> Signed-off-by: Zelong Dong <zelong.dong@amlogic.com>
> ---
> .../reset/amlogic,meson-s4-reset.h | 125 ++++++++++++++++++
> 1 file changed, 125 insertions(+)
> create mode 100644 include/dt-bindings/reset/amlogic,meson-s4-reset.h
>
Please add Acked-by/Reviewed-by tags when posting new versions. However,
there's no need to repost patches *only* to add the tags. The upstream
maintainer will do that for acks received on the version they apply.
If a tag was not added on purpose, please state why and what changed.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 3/3] reset: reset-meson: add support for the Meson-S4 SoC Reset Controller
2022-01-07 2:39 [PATCH 0/3] reset: meson-s4: add reset driver Zelong Dong
2022-01-07 2:39 ` [PATCH 1/3] dt-bindings: reset: Add compatible for Meson-S4 Reset Controller Zelong Dong
2022-01-07 2:39 ` [PATCH 2/3] dt-bindings: reset: add bindings for the Meson-S4 SoC " Zelong Dong
@ 2022-01-07 2:39 ` Zelong Dong
2022-01-07 21:58 ` Martin Blumenstingl
2022-04-04 10:17 ` [PATCH 0/3] reset: meson-s4: add reset driver Philipp Zabel
3 siblings, 1 reply; 10+ messages in thread
From: Zelong Dong @ 2022-01-07 2:39 UTC (permalink / raw)
To: p.zabel, robh+dt, khilman, narmstrong, martin.blumenstingl
Cc: linux-amlogic, linux-kernel, linux-arm-kernel, jbrunet,
devicetree, Zelong Dong
Compared to the A1 SoCs the number of RESET registers is different
and the offset for the level registers is the same. Add a new
compatible string and struct meson_reset_param to add support for the
reset controller on the S4 SoC.
Signed-off-by: Zelong Dong <zelong.dong@amlogic.com>
---
drivers/reset/reset-meson.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
index c9bc325ad65a..26dc54778615 100644
--- a/drivers/reset/reset-meson.c
+++ b/drivers/reset/reset-meson.c
@@ -98,11 +98,17 @@ static const struct meson_reset_param meson_a1_param = {
.level_offset = 0x40,
};
+static const struct meson_reset_param meson_s4_param = {
+ .reg_count = 6,
+ .level_offset = 0x40,
+};
+
static const struct of_device_id meson_reset_dt_ids[] = {
{ .compatible = "amlogic,meson8b-reset", .data = &meson8b_param},
{ .compatible = "amlogic,meson-gxbb-reset", .data = &meson8b_param},
{ .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},
{ /* sentinel */ },
};
MODULE_DEVICE_TABLE(of, meson_reset_dt_ids);
--
2.34.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 3/3] reset: reset-meson: add support for the Meson-S4 SoC Reset Controller
2022-01-07 2:39 ` [PATCH 3/3] reset: reset-meson: add support " Zelong Dong
@ 2022-01-07 21:58 ` Martin Blumenstingl
0 siblings, 0 replies; 10+ messages in thread
From: Martin Blumenstingl @ 2022-01-07 21:58 UTC (permalink / raw)
To: Zelong Dong
Cc: p.zabel, robh+dt, khilman, Neil Armstrong, linux-amlogic,
linux-kernel, linux-arm-kernel, jbrunet, devicetree
On Fri, Jan 7, 2022 at 3:40 AM Zelong Dong <zelong.dong@amlogic.com> wrote:
>
> Compared to the A1 SoCs the number of RESET registers is different
> and the offset for the level registers is the same. Add a new
> compatible string and struct meson_reset_param to add support for the
> reset controller on the S4 SoC.
>
> Signed-off-by: Zelong Dong <zelong.dong@amlogic.com>
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 0/3] reset: meson-s4: add reset driver
2022-01-07 2:39 [PATCH 0/3] reset: meson-s4: add reset driver Zelong Dong
` (2 preceding siblings ...)
2022-01-07 2:39 ` [PATCH 3/3] reset: reset-meson: add support " Zelong Dong
@ 2022-04-04 10:17 ` Philipp Zabel
3 siblings, 0 replies; 10+ messages in thread
From: Philipp Zabel @ 2022-04-04 10:17 UTC (permalink / raw)
To: Zelong Dong, robh+dt, khilman, narmstrong, martin.blumenstingl
Cc: linux-amlogic, linux-kernel, linux-arm-kernel, jbrunet, devicetree
On Fr, 2022-01-07 at 10:39 +0800, Zelong Dong wrote:
>
> This patchset adds Reset controller driver support for Meson-S4 SoC.
> Meson-S4 Reset Controller has 6 banks (the number of reset register)
> and the level-reset register offset is 0x40.
>
>
> Zelong Dong (3):
> dt-bindings: reset: Add compatible for Meson-S4 Reset Controller
> dt-bindings: reset: add bindings for the Meson-S4 SoC Reset
> Controller
> reset: reset-meson: add support for the Meson-S4 SoC Reset
> Controller
>
> .../bindings/reset/amlogic,meson-reset.yaml | 1 +
> drivers/reset/reset-meson.c | 6 +
> .../reset/amlogic,meson-s4-reset.h | 125
> ++++++++++++++++++
> 3 files changed, 132 insertions(+)
> create mode 100644 include/dt-bindings/reset/amlogic,meson-s4-
> reset.h
Thank you, applied to reset/next.
regards
Philipp
^ permalink raw reply [flat|nested] 10+ messages in thread