]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: dts: r8a7745: Add reset control properties
authorGeert Uytterhoeven <geert+renesas@glider.be>
Thu, 16 Mar 2017 14:07:26 +0000 (15:07 +0100)
committerSimon Horman <horms+renesas@verge.net.au>
Tue, 21 Mar 2017 08:18:56 +0000 (09:18 +0100)
Add properties to describe the reset topology for on-SoC devices:
  - Add the "#reset-cells" property to the CPG/MSSR device node,
  - Add resets and reset-names properties to the various device nodes.

This allows to reset SoC devices using the Reset Controller API.

Note that all resets added match the corresponding module clocks.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
arch/arm/boot/dts/r8a7745.dtsi

index bca88715fadad81b5951549efdc15e0c3b94fa97..2feb0084bb3b1b5149afe1efd3f50aeeb6984117 100644 (file)
@@ -62,6 +62,7 @@ gic: interrupt-controller@f1001000 {
                        clocks = <&cpg CPG_MOD 408>;
                        clock-names = "clk";
                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                       resets = <&cpg 408>;
                };
 
                irqc: interrupt-controller@e61c0000 {
@@ -81,6 +82,7 @@ irqc: interrupt-controller@e61c0000 {
                                     <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 407>;
                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                       resets = <&cpg 407>;
                };
 
                timer {
@@ -102,6 +104,7 @@ cpg: clock-controller@e6150000 {
                        clock-names = "extal", "usb_extal";
                        #clock-cells = <2>;
                        #power-domain-cells = <0>;
+                       #reset-cells = <1>;
                };
 
                prr: chipid@ff000044 {
@@ -148,6 +151,7 @@ GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
                        clocks = <&cpg CPG_MOD 219>;
                        clock-names = "fck";
                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                       resets = <&cpg 219>;
                        #dma-cells = <1>;
                        dma-channels = <15>;
                };
@@ -180,6 +184,7 @@ GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
                        clocks = <&cpg CPG_MOD 218>;
                        clock-names = "fck";
                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                       resets = <&cpg 218>;
                        #dma-cells = <1>;
                        dma-channels = <15>;
                };
@@ -195,6 +200,7 @@ scifa0: serial@e6c40000 {
                               <&dmac1 0x21>, <&dmac1 0x22>;
                        dma-names = "tx", "rx", "tx", "rx";
                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                       resets = <&cpg 204>;
                        status = "disabled";
                };
 
@@ -209,6 +215,7 @@ scifa1: serial@e6c50000 {
                               <&dmac1 0x25>, <&dmac1 0x26>;
                        dma-names = "tx", "rx", "tx", "rx";
                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                       resets = <&cpg 203>;
                        status = "disabled";
                };
 
@@ -223,6 +230,7 @@ scifa2: serial@e6c60000 {
                               <&dmac1 0x27>, <&dmac1 0x28>;
                        dma-names = "tx", "rx", "tx", "rx";
                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                       resets = <&cpg 202>;
                        status = "disabled";
                };
 
@@ -237,6 +245,7 @@ scifa3: serial@e6c70000 {
                               <&dmac1 0x1b>, <&dmac1 0x1c>;
                        dma-names = "tx", "rx", "tx", "rx";
                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                       resets = <&cpg 1106>;
                        status = "disabled";
                };
 
@@ -251,6 +260,7 @@ scifa4: serial@e6c78000 {
                               <&dmac1 0x1f>, <&dmac1 0x20>;
                        dma-names = "tx", "rx", "tx", "rx";
                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                       resets = <&cpg 1107>;
                        status = "disabled";
                };
 
@@ -265,6 +275,7 @@ scifa5: serial@e6c80000 {
                               <&dmac1 0x23>, <&dmac1 0x24>;
                        dma-names = "tx", "rx", "tx", "rx";
                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                       resets = <&cpg 1108>;
                        status = "disabled";
                };
 
@@ -279,6 +290,7 @@ scifb0: serial@e6c20000 {
                               <&dmac1 0x3d>, <&dmac1 0x3e>;
                        dma-names = "tx", "rx", "tx", "rx";
                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                       resets = <&cpg 206>;
                        status = "disabled";
                };
 
@@ -293,6 +305,7 @@ scifb1: serial@e6c30000 {
                               <&dmac1 0x19>, <&dmac1 0x1a>;
                        dma-names = "tx", "rx", "tx", "rx";
                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                       resets = <&cpg 207>;
                        status = "disabled";
                };
 
@@ -307,6 +320,7 @@ scifb2: serial@e6ce0000 {
                               <&dmac1 0x1d>, <&dmac1 0x1e>;
                        dma-names = "tx", "rx", "tx", "rx";
                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                       resets = <&cpg 216>;
                        status = "disabled";
                };
 
@@ -322,6 +336,7 @@ scif0: serial@e6e60000 {
                               <&dmac1 0x29>, <&dmac1 0x2a>;
                        dma-names = "tx", "rx", "tx", "rx";
                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                       resets = <&cpg 721>;
                        status = "disabled";
                };
 
@@ -337,6 +352,7 @@ scif1: serial@e6e68000 {
                               <&dmac1 0x2d>, <&dmac1 0x2e>;
                        dma-names = "tx", "rx", "tx", "rx";
                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                       resets = <&cpg 720>;
                        status = "disabled";
                };
 
@@ -352,6 +368,7 @@ scif2: serial@e6e58000 {
                               <&dmac1 0x2b>, <&dmac1 0x2c>;
                        dma-names = "tx", "rx", "tx", "rx";
                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                       resets = <&cpg 719>;
                        status = "disabled";
                };
 
@@ -367,6 +384,7 @@ scif3: serial@e6ea8000 {
                               <&dmac1 0x2f>, <&dmac1 0x30>;
                        dma-names = "tx", "rx", "tx", "rx";
                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                       resets = <&cpg 718>;
                        status = "disabled";
                };
 
@@ -382,6 +400,7 @@ scif4: serial@e6ee0000 {
                               <&dmac1 0xfb>, <&dmac1 0xfc>;
                        dma-names = "tx", "rx", "tx", "rx";
                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                       resets = <&cpg 715>;
                        status = "disabled";
                };
 
@@ -397,6 +416,7 @@ scif5: serial@e6ee8000 {
                               <&dmac1 0xfd>, <&dmac1 0xfe>;
                        dma-names = "tx", "rx", "tx", "rx";
                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                       resets = <&cpg 714>;
                        status = "disabled";
                };
 
@@ -412,6 +432,7 @@ hscif0: serial@e62c0000 {
                               <&dmac1 0x39>, <&dmac1 0x3a>;
                        dma-names = "tx", "rx", "tx", "rx";
                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                       resets = <&cpg 717>;
                        status = "disabled";
                };
 
@@ -427,6 +448,7 @@ hscif1: serial@e62c8000 {
                               <&dmac1 0x4d>, <&dmac1 0x4e>;
                        dma-names = "tx", "rx", "tx", "rx";
                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                       resets = <&cpg 716>;
                        status = "disabled";
                };
 
@@ -442,6 +464,7 @@ hscif2: serial@e62d0000 {
                               <&dmac1 0x3b>, <&dmac1 0x3c>;
                        dma-names = "tx", "rx", "tx", "rx";
                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                       resets = <&cpg 713>;
                        status = "disabled";
                };
 
@@ -451,6 +474,7 @@ ether: ethernet@ee700000 {
                        interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 813>;
                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                       resets = <&cpg 813>;
                        phy-mode = "rmii";
                        #address-cells = <1>;
                        #size-cells = <0>;