diff mbox series

arm64: dts: meson: add reset controller for Meson-S4 SoC

Message ID 20220526130158.36651-1-zelong.dong@amlogic.com (mailing list archive)
State New, archived
Headers show
Series arm64: dts: meson: add reset controller for Meson-S4 SoC | expand

Commit Message

zelong dong May 26, 2022, 1:01 p.m. UTC
Add the reset controller device of Meson-S4 SoC family

Signed-off-by: Zelong Dong <zelong.dong@amlogic.com>
---
 arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Neil Armstrong May 27, 2022, 1:45 p.m. UTC | #1
On 26/05/2022 15:01, Zelong Dong wrote:
> Add the reset controller device of Meson-S4 SoC family
> 
> Signed-off-by: Zelong Dong <zelong.dong@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 480afa2cc61f..c750bc60786f 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
> @@ -94,6 +94,12 @@ uart_B: serial@7a000 {
>   				clocks = <&xtal>, <&xtal>, <&xtal>;
>   				clock-names = "xtal", "pclk", "baud";
>   			};
> +
> +			reset: reset-controller@2000 {
> +				compatible = "amlogic,meson-s4-reset";
> +				reg = <0x0 0x2000 0x0 0x98>;
> +				#reset-cells = <1>;
> +			};
>   		};
>   	};
>   };

Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Neil Armstrong May 27, 2022, 1:47 p.m. UTC | #2
Hi,

On Thu, 26 May 2022 21:01:58 +0800, Zelong Dong wrote:
> Add the reset controller device of Meson-S4 SoC family
> 
> 

Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v5.20/arm64)

[1/1] arm64: dts: meson: add reset controller for Meson-S4 SoC
      https://git.kernel.org/amlogic/c/ead23b52f539a4d93a541afe208d70b1a9089e1a

These changes has been applied on the intermediate git tree [1].

The v5.20/arm64 branch will then be sent via a formal Pull Request to the Linux SoC maintainers
for inclusion in their intermediate git branches in order to be sent to Linus during
the next merge window, or sooner if it's a set of fixes.

In the cases of fixes, those will be merged in the current release candidate
kernel and as soon they appear on the Linux master branch they will be
backported to the previous Stable and Long-Stable kernels [2].

The intermediate git branches are merged daily in the linux-next tree [3],
people are encouraged testing these pre-release kernels and report issues on the
relevant mailing-lists.

If problems are discovered on those changes, please submit a signed-off-by revert
patch followed by a corrective changeset.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
[3] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
index 480afa2cc61f..c750bc60786f 100644
--- a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
@@ -94,6 +94,12 @@  uart_B: serial@7a000 {
 				clocks = <&xtal>, <&xtal>, <&xtal>;
 				clock-names = "xtal", "pclk", "baud";
 			};
+
+			reset: reset-controller@2000 {
+				compatible = "amlogic,meson-s4-reset";
+				reg = <0x0 0x2000 0x0 0x98>;
+				#reset-cells = <1>;
+			};
 		};
 	};
 };