]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
arm64: dts: nuvoton: combine NPCM845 reset and clk nodes
authorTomer Maimon <tmaimon77@gmail.com>
Sun, 6 Jul 2025 13:42:06 +0000 (16:42 +0300)
committerAndrew Jeffery <andrew@codeconstruct.com.au>
Mon, 11 Aug 2025 00:08:08 +0000 (09:38 +0930)
Combine the NPCM845 reset and clock controller nodes into a single node
with compatible "nuvoton,npcm845-reset" in nuvoton-common-npcm8xx.dtsi,
using the auxiliary device framework to provide clock functionality.

Update the register range to 0xC4 to cover the shared reset and clock
registers at 0xf0801000.

Remove the separate nuvoton,npcm845-clk node, as the reset driver now
handles clocks via an auxiliary device.

Signed-off-by: Tomer Maimon <tmaimon77@gmail.com>
Link: https://patch.msgid.link/20250706134207.2168184-2-tmaimon77@gmail.com
Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>
arch/arm64/boot/dts/nuvoton/nuvoton-common-npcm8xx.dtsi

index 5be132f3fd076106665865d0216de1368d5e735b..400d5c5b71ac0971995e40009d877008fc5083f6 100644 (file)
                interrupt-parent = <&gic>;
                ranges;
 
-               rstc: reset-controller@f0801000 {
+               clk: rstc: reset-controller@f0801000 {
                        compatible = "nuvoton,npcm845-reset";
-                       reg = <0x0 0xf0801000 0x0 0x78>;
-                       #reset-cells = <2>;
+                       reg = <0x0 0xf0801000 0x0 0xC4>;
                        nuvoton,sysgcr = <&gcr>;
-               };
-
-               clk: clock-controller@f0801000 {
-                       compatible = "nuvoton,npcm845-clk";
+                       #reset-cells = <2>;
                        #clock-cells = <1>;
-                       reg = <0x0 0xf0801000 0x0 0x1000>;
                };
 
                apb {