arm64: dts: renesas: r8a77965: use r8a77965-sysc binding definitions

Replace the hardcoded power domain indices by R8A77965_PD_* symbols.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
[simon: dropped hunk to include r8a77965-sysc.h which is already present]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

diff --git a/arch/arm64/boot/dts/renesas/r8a77965.dtsi b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
index 7c9555309c0ac34dbeb4332554ef747c7184e66c..536fed8eec6a48f1dc0b46cd29f12830eb33dbdf 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a77965.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
@@ -61,7 +61,7 @@ a57_0: cpu@0 {
                        compatible = "arm,cortex-a57", "arm,armv8";
                        reg = <0x0>;
                        device_type = "cpu";
-                       power-domains = <&sysc 0>;
+                       power-domains = <&sysc R8A77965_PD_CA57_CPU0>;
                        next-level-cache = <&L2_CA57>;
                        enable-method = "psci";
                };
@@ -70,14 +70,14 @@ a57_1: cpu@1 {
                        compatible = "arm,cortex-a57","arm,armv8";
                        reg = <0x1>;
                        device_type = "cpu";
-                       power-domains = <&sysc 1>;
+                       power-domains = <&sysc R8A77965_PD_CA57_CPU1>;
                        next-level-cache = <&L2_CA57>;
                        enable-method = "psci";
                };
 
                L2_CA57: cache-controller-0 {
                        compatible = "cache";
-                       power-domains = <&sysc 12>;
+                       power-domains = <&sysc R8A77965_PD_CA57_SCU>;
                        cache-unified;
                        cache-level = <2>;
                };
@@ -147,7 +147,7 @@ gpio0: gpio@e6050000 {
                        #interrupt-cells = <2>;
                        interrupt-controller;
                        clocks = <&cpg CPG_MOD 912>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 912>;
                };
 
@@ -162,7 +162,7 @@ gpio1: gpio@e6051000 {
                        #interrupt-cells = <2>;
                        interrupt-controller;
                        clocks = <&cpg CPG_MOD 911>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 911>;
                };
 
@@ -177,7 +177,7 @@ gpio2: gpio@e6052000 {
                        #interrupt-cells = <2>;
                        interrupt-controller;
                        clocks = <&cpg CPG_MOD 910>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 910>;
                };
 
@@ -192,7 +192,7 @@ gpio3: gpio@e6053000 {
                        #interrupt-cells = <2>;
                        interrupt-controller;
                        clocks = <&cpg CPG_MOD 909>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 909>;
                };
 
@@ -207,7 +207,7 @@ gpio4: gpio@e6054000 {
                        #interrupt-cells = <2>;
                        interrupt-controller;
                        clocks = <&cpg CPG_MOD 908>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 908>;
                };
 
@@ -222,7 +222,7 @@ gpio5: gpio@e6055000 {
                        #interrupt-cells = <2>;
                        interrupt-controller;
                        clocks = <&cpg CPG_MOD 907>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 907>;
                };
 
@@ -237,7 +237,7 @@ gpio6: gpio@e6055400 {
                        #interrupt-cells = <2>;
                        interrupt-controller;
                        clocks = <&cpg CPG_MOD 906>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 906>;
                };
 
@@ -252,7 +252,7 @@ gpio7: gpio@e6055800 {
                        #interrupt-cells = <2>;
                        interrupt-controller;
                        clocks = <&cpg CPG_MOD 905>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 905>;
                };
 
@@ -294,7 +294,7 @@ GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH
                                      GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH
                                      GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 407>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 407>;
                };
 
@@ -348,7 +348,7 @@ i2c_dvfs: i2c@e60b0000 {
                        reg = <0 0xe60b0000 0 0x425>;
                        interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 926>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 926>;
                        dmas = <&dmac0 0x11>, <&dmac0 0x10>;
                        dma-names = "tx", "rx";
@@ -367,7 +367,7 @@ hsusb: usb@e6590000 {
                        renesas,buswait = <11>;
                        phys = <&usb2_phy0>;
                        phy-names = "usb";
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 704>;
                        status = "disabled";
                };
@@ -380,7 +380,7 @@ usb_dmac0: dma-controller@e65a0000 {
                                      GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "ch0", "ch1";
                        clocks = <&cpg CPG_MOD 330>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 330>;
                        #dma-cells = <1>;
                        dma-channels = <2>;
@@ -394,7 +394,7 @@ usb_dmac1: dma-controller@e65b0000 {
                                      GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "ch0", "ch1";
                        clocks = <&cpg CPG_MOD 331>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 331>;
                        #dma-cells = <1>;
                        dma-channels = <2>;
@@ -407,7 +407,7 @@ usb3_phy0: usb-phy@e65ee000 {
                        clocks = <&cpg CPG_MOD 328>, <&usb3s0_clk>,
                                 <&usb_extal_clk>;
                        clock-names = "usb3-if", "usb3s_clk", "usb_extal";
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 328>;
                        #phy-cells = <0>;
                        status = "disabled";
@@ -441,7 +441,7 @@ GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH
                                        "ch12", "ch13", "ch14", "ch15";
                        clocks = <&cpg CPG_MOD 219>;
                        clock-names = "fck";
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 219>;
                        #dma-cells = <1>;
                        dma-channels = <16>;
@@ -475,7 +475,7 @@ GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH
                                        "ch12", "ch13", "ch14", "ch15";
                        clocks = <&cpg CPG_MOD 218>;
                        clock-names = "fck";
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 218>;
                        #dma-cells = <1>;
                        dma-channels = <16>;
@@ -509,7 +509,7 @@ GIC_SPI 431 IRQ_TYPE_LEVEL_HIGH
                                        "ch12", "ch13", "ch14", "ch15";
                        clocks = <&cpg CPG_MOD 217>;
                        clock-names = "fck";
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 217>;
                        #dma-cells = <1>;
                        dma-channels = <16>;
@@ -552,7 +552,7 @@ avb: ethernet@e6800000 {
                                          "ch20", "ch21", "ch22", "ch23",
                                          "ch24";
                        clocks = <&cpg CPG_MOD 812>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 812>;
                        phy-mode = "rgmii";
                        #address-cells = <1>;
@@ -566,7 +566,7 @@ pwm0: pwm@e6e30000 {
                        #pwm-cells = <2>;
                        clocks = <&cpg CPG_MOD 523>;
                        resets = <&cpg 523>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        status = "disabled";
                };
 
@@ -576,7 +576,7 @@ pwm1: pwm@e6e31000 {
                        #pwm-cells = <2>;
                        clocks = <&cpg CPG_MOD 523>;
                        resets = <&cpg 523>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        status = "disabled";
                };
 
@@ -586,7 +586,7 @@ pwm2: pwm@e6e32000 {
                        #pwm-cells = <2>;
                        clocks = <&cpg CPG_MOD 523>;
                        resets = <&cpg 523>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        status = "disabled";
                };
 
@@ -596,7 +596,7 @@ pwm3: pwm@e6e33000 {
                        #pwm-cells = <2>;
                        clocks = <&cpg CPG_MOD 523>;
                        resets = <&cpg 523>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        status = "disabled";
                };
 
@@ -606,7 +606,7 @@ pwm4: pwm@e6e34000 {
                        #pwm-cells = <2>;
                        clocks = <&cpg CPG_MOD 523>;
                        resets = <&cpg 523>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        status = "disabled";
                };
 
@@ -616,7 +616,7 @@ pwm5: pwm@e6e35000 {
                        #pwm-cells = <2>;
                        clocks = <&cpg CPG_MOD 523>;
                        resets = <&cpg 523>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        status = "disabled";
                };
 
@@ -626,7 +626,7 @@ pwm6: pwm@e6e36000 {
                        #pwm-cells = <2>;
                        clocks = <&cpg CPG_MOD 523>;
                        resets = <&cpg 523>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        status = "disabled";
                };
 
@@ -642,7 +642,7 @@ scif0: serial@e6e60000 {
                        dmas = <&dmac1 0x51>, <&dmac1 0x50>,
                               <&dmac2 0x51>, <&dmac2 0x50>;
                        dma-names = "tx", "rx", "tx", "rx";
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 207>;
                        status = "disabled";
                };
@@ -659,7 +659,7 @@ scif1: serial@e6e68000 {
                        dmas = <&dmac1 0x53>, <&dmac1 0x52>,
                               <&dmac2 0x53>, <&dmac2 0x52>;
                        dma-names = "tx", "rx", "tx", "rx";
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 206>;
                        status = "disabled";
                };
@@ -673,7 +673,7 @@ scif2: serial@e6e88000 {
                                 <&cpg CPG_CORE 20>,
                                 <&scif_clk>;
                        clock-names = "fck", "brg_int", "scif_clk";
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 310>;
                        status = "disabled";
                };
@@ -689,7 +689,7 @@ scif3: serial@e6c50000 {
                        clock-names = "fck", "brg_int", "scif_clk";
                        dmas = <&dmac0 0x57>, <&dmac0 0x56>;
                        dma-names = "tx", "rx";
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 204>;
                        status = "disabled";
                };
@@ -705,7 +705,7 @@ scif4: serial@e6c40000 {
                        clock-names = "fck", "brg_int", "scif_clk";
                        dmas = <&dmac0 0x59>, <&dmac0 0x58>;
                        dma-names = "tx", "rx";
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 203>;
                        status = "disabled";
                };
@@ -722,7 +722,7 @@ scif5: serial@e6f30000 {
                        dmas = <&dmac1 0x5b>, <&dmac1 0x5a>,
                               <&dmac2 0x5b>, <&dmac2 0x5a>;
                        dma-names = "tx", "rx", "tx", "rx";
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 202>;
                        status = "disabled";
                };
@@ -736,7 +736,7 @@ msiof0: spi@e6e90000 {
                        dmas = <&dmac1 0x41>, <&dmac1 0x40>,
                               <&dmac2 0x41>, <&dmac2 0x40>;
                        dma-names = "tx", "rx", "tx", "rx";
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 211>;
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -752,7 +752,7 @@ msiof1: spi@e6ea0000 {
                        dmas = <&dmac1 0x43>, <&dmac1 0x42>,
                               <&dmac2 0x43>, <&dmac2 0x42>;
                        dma-names = "tx", "rx", "tx", "rx";
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 210>;
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -767,7 +767,7 @@ msiof2: spi@e6c00000 {
                        clocks = <&cpg CPG_MOD 209>;
                        dmas = <&dmac0 0x45>, <&dmac0 0x44>;
                        dma-names = "tx", "rx";
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 209>;
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -782,7 +782,7 @@ msiof3: spi@e6c10000 {
                        clocks = <&cpg CPG_MOD 208>;
                        dmas = <&dmac0 0x47>, <&dmac0 0x46>;
                        dma-names = "tx", "rx";
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 208>;
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -873,7 +873,7 @@ xhci0: usb@ee000000 {
                        reg = <0 0xee000000 0 0xc00>;
                        interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 328>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 328>;
                        status = "disabled";
                };
@@ -884,7 +884,7 @@ usb3_peri0: usb@ee020000 {
                        reg = <0 0xee020000 0 0x400>;
                        interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 328>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 328>;
                        status = "disabled";
                };
@@ -896,7 +896,7 @@ ohci0: usb@ee080000 {
                        clocks = <&cpg CPG_MOD 703>;
                        phys = <&usb2_phy0>;
                        phy-names = "usb";
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 703>;
                        status = "disabled";
                };
@@ -908,7 +908,7 @@ ohci1: usb@ee0a0000 {
                        clocks = <&cpg CPG_MOD 702>;
                        phys = <&usb2_phy1>;
                        phy-names = "usb";
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 702>;
                        status = "disabled";
                };
@@ -921,7 +921,7 @@ ehci0: usb@ee080100 {
                        phys = <&usb2_phy0>;
                        phy-names = "usb";
                        companion = <&ohci0>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 703>;
                        status = "disabled";
                };
@@ -934,7 +934,7 @@ ehci1: usb@ee0a0100 {
                        phys = <&usb2_phy1>;
                        phy-names = "usb";
                        companion = <&ohci1>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 702>;
                        status = "disabled";
                };
@@ -945,7 +945,7 @@ usb2_phy0: usb-phy@ee080200 {
                        reg = <0 0xee080200 0 0x700>;
                        interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 703>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 703>;
                        #phy-cells = <0>;
                        status = "disabled";
@@ -956,7 +956,7 @@ usb2_phy1: usb-phy@ee0a0200 {
                                     "renesas,rcar-gen3-usb2-phy";
                        reg = <0 0xee0a0200 0 0x700>;
                        clocks = <&cpg CPG_MOD 703>;
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 703>;
                        #phy-cells = <0>;
                        status = "disabled";
@@ -995,7 +995,7 @@ gic: interrupt-controller@f1010000 {
                                        (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
                        clocks = <&cpg CPG_MOD 408>;
                        clock-names = "clk";
-                       power-domains = <&sysc 32>;
+                       power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
                        resets = <&cpg 408>;
                };