]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge tag 'renesas-arm64-dt2-for-v4.12' of https://git.kernel.org/pub/scm/linux/kerne...
authorOlof Johansson <olof@lixom.net>
Wed, 19 Apr 2017 13:32:49 +0000 (06:32 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 19 Apr 2017 13:32:49 +0000 (06:32 -0700)
Second Round of Renesas ARM64 Based SoC DT Updates for v4.12

Corrections:
* r8a7795: Correct SATA device size to 2MiB for r8a7795 SoC

Cleanup:
* Drop _clk suffix from X12 clock node name for r8a7795 SoC

Enhancements:
* Add reset control properties for r8a779[56]

* tag 'renesas-arm64-dt2-for-v4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  arm64: dts: r8a7795: salvator-x: Drop _clk suffix from X12 clock node name
  arm64: dts: r8a7796: Add reset control properties
  arm64: dts: r8a7795: Add reset control properties
  arm64: dts: r8a7795: Correct SATA device size to 2MiB

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
arch/arm64/boot/dts/renesas/r8a7795.dtsi
arch/arm64/boot/dts/renesas/r8a7796.dtsi

index f25241921067dcef59a61dd99a88ad0b2ad341cc..639aa085d9966676b07b6eaf4c54ee3b9b5476cb 100644 (file)
@@ -56,7 +56,7 @@
                reg = <0x0 0x48000000 0x0 0x38000000>;
        };
 
-       x12_clk: x12_clk {
+       x12_clk: x12 {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <24576000>;
index 55c09f1b89c947853c580c23005b07ab647c2ae4..e99d6443b3e493a48da79c1f54060d6eddc3b963 100644 (file)
                        clocks = <&cpg CPG_MOD 408>;
                        clock-names = "clk";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 408>;
                };
 
                wdt0: watchdog@e6020000 {
                        reg = <0 0xe6020000 0 0x0c>;
                        clocks = <&cpg CPG_MOD 402>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 402>;
                        status = "disabled";
                };
 
                        interrupt-controller;
                        clocks = <&cpg CPG_MOD 912>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 912>;
                };
 
                gpio1: gpio@e6051000 {
                        interrupt-controller;
                        clocks = <&cpg CPG_MOD 911>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 911>;
                };
 
                gpio2: gpio@e6052000 {
                        interrupt-controller;
                        clocks = <&cpg CPG_MOD 910>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 910>;
                };
 
                gpio3: gpio@e6053000 {
                        interrupt-controller;
                        clocks = <&cpg CPG_MOD 909>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 909>;
                };
 
                gpio4: gpio@e6054000 {
                        interrupt-controller;
                        clocks = <&cpg CPG_MOD 908>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 908>;
                };
 
                gpio5: gpio@e6055000 {
                        interrupt-controller;
                        clocks = <&cpg CPG_MOD 907>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 907>;
                };
 
                gpio6: gpio@e6055400 {
                        interrupt-controller;
                        clocks = <&cpg CPG_MOD 906>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 906>;
                };
 
                gpio7: gpio@e6055800 {
                        interrupt-controller;
                        clocks = <&cpg CPG_MOD 905>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 905>;
                };
 
                pmu_a57 {
                        clock-names = "extal", "extalr";
                        #clock-cells = <2>;
                        #power-domain-cells = <0>;
+                       #reset-cells = <1>;
                };
 
                rst: reset-controller@e6160000 {
                                      GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 407>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 407>;
                };
 
                dmac0: dma-controller@e6700000 {
                        clocks = <&cpg CPG_MOD 219>;
                        clock-names = "fck";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 219>;
                        #dma-cells = <1>;
                        dma-channels = <16>;
                };
                        clocks = <&cpg CPG_MOD 218>;
                        clock-names = "fck";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 218>;
                        #dma-cells = <1>;
                        dma-channels = <16>;
                };
                        clocks = <&cpg CPG_MOD 217>;
                        clock-names = "fck";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 217>;
                        #dma-cells = <1>;
                        dma-channels = <16>;
                };
                        clocks = <&cpg CPG_MOD 502>;
                        clock-names = "fck";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 502>;
                        #dma-cells = <1>;
                        dma-channels = <16>;
                };
                        clocks = <&cpg CPG_MOD 501>;
                        clock-names = "fck";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 501>;
                        #dma-cells = <1>;
                        dma-channels = <16>;
                };
                                          "ch24";
                        clocks = <&cpg CPG_MOD 812>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 812>;
                        phy-mode = "rgmii-txid";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        assigned-clocks = <&cpg CPG_CORE R8A7795_CLK_CANFD>;
                        assigned-clock-rates = <40000000>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 916>;
                        status = "disabled";
                };
 
                        assigned-clocks = <&cpg CPG_CORE R8A7795_CLK_CANFD>;
                        assigned-clock-rates = <40000000>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 915>;
                        status = "disabled";
                };
 
                        assigned-clocks = <&cpg CPG_CORE R8A7795_CLK_CANFD>;
                        assigned-clock-rates = <40000000>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 914>;
                        status = "disabled";
 
                        channel0 {
                        dmas = <&dmac1 0x31>, <&dmac1 0x30>;
                        dma-names = "tx", "rx";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 520>;
                        status = "disabled";
                };
 
                        dmas = <&dmac1 0x33>, <&dmac1 0x32>;
                        dma-names = "tx", "rx";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 519>;
                        status = "disabled";
                };
 
                        dmas = <&dmac1 0x35>, <&dmac1 0x34>;
                        dma-names = "tx", "rx";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 518>;
                        status = "disabled";
                };
 
                        dmas = <&dmac0 0x37>, <&dmac0 0x36>;
                        dma-names = "tx", "rx";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 517>;
                        status = "disabled";
                };
 
                        dmas = <&dmac0 0x39>, <&dmac0 0x38>;
                        dma-names = "tx", "rx";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 516>;
                        status = "disabled";
                };
 
                        dmas = <&dmac1 0x51>, <&dmac1 0x50>;
                        dma-names = "tx", "rx";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 207>;
                        status = "disabled";
                };
 
                        dmas = <&dmac1 0x53>, <&dmac1 0x52>;
                        dma-names = "tx", "rx";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 206>;
                        status = "disabled";
                };
 
                        dmas = <&dmac1 0x13>, <&dmac1 0x12>;
                        dma-names = "tx", "rx";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 310>;
                        status = "disabled";
                };
 
                        dmas = <&dmac0 0x57>, <&dmac0 0x56>;
                        dma-names = "tx", "rx";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 204>;
                        status = "disabled";
                };
 
                        dmas = <&dmac0 0x59>, <&dmac0 0x58>;
                        dma-names = "tx", "rx";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 203>;
                        status = "disabled";
                };
 
                        dmas = <&dmac1 0x5b>, <&dmac1 0x5a>;
                        dma-names = "tx", "rx";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 202>;
                        status = "disabled";
                };
 
                        interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 926>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 926>;
                        status = "disabled";
                };
 
                        interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 931>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 931>;
                        dmas = <&dmac1 0x91>, <&dmac1 0x90>;
                        dma-names = "tx", "rx";
                        i2c-scl-internal-delay-ns = <110>;
                        interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 930>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 930>;
                        dmas = <&dmac1 0x93>, <&dmac1 0x92>;
                        dma-names = "tx", "rx";
                        i2c-scl-internal-delay-ns = <6>;
                        interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 929>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 929>;
                        dmas = <&dmac1 0x95>, <&dmac1 0x94>;
                        dma-names = "tx", "rx";
                        i2c-scl-internal-delay-ns = <6>;
                        interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 928>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 928>;
                        dmas = <&dmac0 0x97>, <&dmac0 0x96>;
                        dma-names = "tx", "rx";
                        i2c-scl-internal-delay-ns = <110>;
                        interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 927>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 927>;
                        dmas = <&dmac0 0x99>, <&dmac0 0x98>;
                        dma-names = "tx", "rx";
                        i2c-scl-internal-delay-ns = <110>;
                        interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 919>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 919>;
                        dmas = <&dmac0 0x9b>, <&dmac0 0x9a>;
                        dma-names = "tx", "rx";
                        i2c-scl-internal-delay-ns = <110>;
                        interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 918>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 918>;
                        dmas = <&dmac0 0x9d>, <&dmac0 0x9c>;
                        dma-names = "tx", "rx";
                        i2c-scl-internal-delay-ns = <6>;
                        reg = <0 0xe6e30000 0 0x8>;
                        clocks = <&cpg CPG_MOD 523>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 523>;
                        #pwm-cells = <2>;
                        status = "disabled";
                };
                        reg = <0 0xe6e31000 0 0x8>;
                        clocks = <&cpg CPG_MOD 523>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 523>;
                        #pwm-cells = <2>;
                        status = "disabled";
                };
                        reg = <0 0xe6e32000 0 0x8>;
                        clocks = <&cpg CPG_MOD 523>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 523>;
                        #pwm-cells = <2>;
                        status = "disabled";
                };
                        reg = <0 0xe6e33000 0 0x8>;
                        clocks = <&cpg CPG_MOD 523>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 523>;
                        #pwm-cells = <2>;
                        status = "disabled";
                };
                        reg = <0 0xe6e34000 0 0x8>;
                        clocks = <&cpg CPG_MOD 523>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 523>;
                        #pwm-cells = <2>;
                        status = "disabled";
                };
                        reg = <0 0xe6e35000 0 0x8>;
                        clocks = <&cpg CPG_MOD 523>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 523>;
                        #pwm-cells = <2>;
                        status = "disabled";
                };
                        reg = <0 0xe6e36000 0 0x8>;
                        clocks = <&cpg CPG_MOD 523>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 523>;
                        #pwm-cells = <2>;
                        status = "disabled";
                };
 
                sata: sata@ee300000 {
                        compatible = "renesas,sata-r8a7795";
-                       reg = <0 0xee300000 0 0x1fff>;
+                       reg = <0 0xee300000 0 0x200000>;
                        interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 815>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 815>;
                        status = "disabled";
                };
 
                        interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 328>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 328>;
                        status = "disabled";
                };
 
                        interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 327>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 327>;
                        status = "disabled";
                };
 
                        interrupt-names = "ch0", "ch1";
                        clocks = <&cpg CPG_MOD 330>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 330>;
                        #dma-cells = <1>;
                        dma-channels = <2>;
                };
                        interrupt-names = "ch0", "ch1";
                        clocks = <&cpg CPG_MOD 331>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 331>;
                        #dma-cells = <1>;
                        dma-channels = <2>;
                };
                        clocks = <&cpg CPG_MOD 314>;
                        max-frequency = <200000000>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 314>;
                        status = "disabled";
                };
 
                        clocks = <&cpg CPG_MOD 313>;
                        max-frequency = <200000000>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 313>;
                        status = "disabled";
                };
 
                        clocks = <&cpg CPG_MOD 312>;
                        max-frequency = <200000000>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 312>;
                        status = "disabled";
                };
 
                        clocks = <&cpg CPG_MOD 311>;
                        max-frequency = <200000000>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 311>;
                        status = "disabled";
                };
 
                        interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 703>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 703>;
                        #phy-cells = <0>;
                        status = "disabled";
                };
                        reg = <0 0xee0a0200 0 0x700>;
                        clocks = <&cpg CPG_MOD 702>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 702>;
                        #phy-cells = <0>;
                        status = "disabled";
                };
                        reg = <0 0xee0c0200 0 0x700>;
                        clocks = <&cpg CPG_MOD 701>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 701>;
                        #phy-cells = <0>;
                        status = "disabled";
                };
                        phys = <&usb2_phy0>;
                        phy-names = "usb";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 703>;
                        status = "disabled";
                };
 
                        phys = <&usb2_phy1>;
                        phy-names = "usb";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 702>;
                        status = "disabled";
                };
 
                        phys = <&usb2_phy2>;
                        phy-names = "usb";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 701>;
                        status = "disabled";
                };
 
                        phys = <&usb2_phy0>;
                        phy-names = "usb";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 703>;
                        status = "disabled";
                };
 
                        phys = <&usb2_phy1>;
                        phy-names = "usb";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 702>;
                        status = "disabled";
                };
 
                        phys = <&usb2_phy2>;
                        phy-names = "usb";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 701>;
                        status = "disabled";
                };
 
                        phys = <&usb2_phy0>;
                        phy-names = "usb";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 704>;
                        status = "disabled";
                };
 
                        clocks = <&cpg CPG_MOD 319>, <&pcie_bus_clk>;
                        clock-names = "pcie", "pcie_bus";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 319>;
                        status = "disabled";
                };
 
                        clocks = <&cpg CPG_MOD 318>, <&pcie_bus_clk>;
                        clock-names = "pcie", "pcie_bus";
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 318>;
                        status = "disabled";
                };
 
                        interrupts = <GIC_SPI 465 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 624>;
                        power-domains = <&sysc R8A7795_PD_A3VP>;
+                       resets = <&cpg 624>;
 
                        renesas,fcp = <&fcpvb1>;
                };
                        reg = <0 0xfe92f000 0 0x200>;
                        clocks = <&cpg CPG_MOD 606>;
                        power-domains = <&sysc R8A7795_PD_A3VP>;
+                       resets = <&cpg 606>;
                };
 
                fcpf0: fcp@fe950000 {
                        reg = <0 0xfe950000 0 0x200>;
                        clocks = <&cpg CPG_MOD 615>;
                        power-domains = <&sysc R8A7795_PD_A3VP>;
+                       resets = <&cpg 615>;
                };
 
                fcpf1: fcp@fe951000 {
                        reg = <0 0xfe951000 0 0x200>;
                        clocks = <&cpg CPG_MOD 614>;
                        power-domains = <&sysc R8A7795_PD_A3VP>;
+                       resets = <&cpg 614>;
                };
 
                fcpf2: fcp@fe952000 {
                        reg = <0 0xfe952000 0 0x200>;
                        clocks = <&cpg CPG_MOD 613>;
                        power-domains = <&sysc R8A7795_PD_A3VP>;
+                       resets = <&cpg 613>;
                };
 
                vspbd: vsp@fe960000 {
                        interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 626>;
                        power-domains = <&sysc R8A7795_PD_A3VP>;
+                       resets = <&cpg 626>;
 
                        renesas,fcp = <&fcpvb0>;
                };
                        reg = <0 0xfe96f000 0 0x200>;
                        clocks = <&cpg CPG_MOD 607>;
                        power-domains = <&sysc R8A7795_PD_A3VP>;
+                       resets = <&cpg 607>;
                };
 
                vspi0: vsp@fe9a0000 {
                        interrupts = <GIC_SPI 444 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 631>;
                        power-domains = <&sysc R8A7795_PD_A3VP>;
+                       resets = <&cpg 631>;
 
                        renesas,fcp = <&fcpvi0>;
                };
                        reg = <0 0xfe9af000 0 0x200>;
                        clocks = <&cpg CPG_MOD 611>;
                        power-domains = <&sysc R8A7795_PD_A3VP>;
+                       resets = <&cpg 611>;
                };
 
                vspi1: vsp@fe9b0000 {
                        interrupts = <GIC_SPI 445 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 630>;
                        power-domains = <&sysc R8A7795_PD_A3VP>;
+                       resets = <&cpg 630>;
 
                        renesas,fcp = <&fcpvi1>;
                };
                        reg = <0 0xfe9bf000 0 0x200>;
                        clocks = <&cpg CPG_MOD 610>;
                        power-domains = <&sysc R8A7795_PD_A3VP>;
+                       resets = <&cpg 610>;
                };
 
                vspi2: vsp@fe9c0000 {
                        interrupts = <GIC_SPI 446 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 629>;
                        power-domains = <&sysc R8A7795_PD_A3VP>;
+                       resets = <&cpg 629>;
 
                        renesas,fcp = <&fcpvi2>;
                };
                        reg = <0 0xfe9cf000 0 0x200>;
                        clocks = <&cpg CPG_MOD 609>;
                        power-domains = <&sysc R8A7795_PD_A3VP>;
+                       resets = <&cpg 609>;
                };
 
                vspd0: vsp@fea20000 {
                        interrupts = <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 623>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 623>;
 
                        renesas,fcp = <&fcpvd0>;
                };
                        reg = <0 0xfea27000 0 0x200>;
                        clocks = <&cpg CPG_MOD 603>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 603>;
                };
 
                vspd1: vsp@fea28000 {
                        interrupts = <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 622>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 622>;
 
                        renesas,fcp = <&fcpvd1>;
                };
                        reg = <0 0xfea2f000 0 0x200>;
                        clocks = <&cpg CPG_MOD 602>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 602>;
                };
 
                vspd2: vsp@fea30000 {
                        interrupts = <GIC_SPI 468 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 621>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 621>;
 
                        renesas,fcp = <&fcpvd2>;
                };
                        reg = <0 0xfea37000 0 0x200>;
                        clocks = <&cpg CPG_MOD 601>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 601>;
                };
 
                vspd3: vsp@fea38000 {
                        interrupts = <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 620>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 620>;
 
                        renesas,fcp = <&fcpvd3>;
                };
                        reg = <0 0xfea3f000 0 0x200>;
                        clocks = <&cpg CPG_MOD 600>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 600>;
                };
 
                fdp1@fe940000 {
                        interrupts = <GIC_SPI 262 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 119>;
                        power-domains = <&sysc R8A7795_PD_A3VP>;
+                       resets = <&cpg 119>;
                        renesas,fcp = <&fcpf0>;
                };
 
                        interrupts = <GIC_SPI 263 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 118>;
                        power-domains = <&sysc R8A7795_PD_A3VP>;
+                       resets = <&cpg 118>;
                        renesas,fcp = <&fcpf1>;
                };
 
                        interrupts = <GIC_SPI 264 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 117>;
                        power-domains = <&sysc R8A7795_PD_A3VP>;
+                       resets = <&cpg 117>;
                        renesas,fcp = <&fcpf2>;
                };
 
                                     <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 522>;
                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                       resets = <&cpg 522>;
                        #thermal-sensor-cells = <1>;
                        status = "okay";
                };
index a90abf14dc4e7c79fde9bf60fc0f6a975ddeb57b..2ec1ed5f499165ada8a7b2e41cbf4bf1339aa6af 100644 (file)
                        clocks = <&cpg CPG_MOD 408>;
                        clock-names = "clk";
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 408>;
                };
 
                timer {
                        reg = <0 0xe6020000 0 0x0c>;
                        clocks = <&cpg CPG_MOD 402>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 402>;
                        status = "disabled";
                };
 
                        interrupt-controller;
                        clocks = <&cpg CPG_MOD 912>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 912>;
                };
 
                gpio1: gpio@e6051000 {
                        interrupt-controller;
                        clocks = <&cpg CPG_MOD 911>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 911>;
                };
 
                gpio2: gpio@e6052000 {
                        interrupt-controller;
                        clocks = <&cpg CPG_MOD 910>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 910>;
                };
 
                gpio3: gpio@e6053000 {
                        interrupt-controller;
                        clocks = <&cpg CPG_MOD 909>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 909>;
                };
 
                gpio4: gpio@e6054000 {
                        interrupt-controller;
                        clocks = <&cpg CPG_MOD 908>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 908>;
                };
 
                gpio5: gpio@e6055000 {
                        interrupt-controller;
                        clocks = <&cpg CPG_MOD 907>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 907>;
                };
 
                gpio6: gpio@e6055400 {
                        interrupt-controller;
                        clocks = <&cpg CPG_MOD 906>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 906>;
                };
 
                gpio7: gpio@e6055800 {
                        interrupt-controller;
                        clocks = <&cpg CPG_MOD 905>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 905>;
                };
 
                pfc: pin-controller@e6060000 {
                        clock-names = "extal", "extalr";
                        #clock-cells = <2>;
                        #power-domain-cells = <0>;
+                       #reset-cells = <1>;
                };
 
                rst: reset-controller@e6160000 {
                        interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 926>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 926>;
                        status = "disabled";
                };
 
                        interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 931>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 931>;
                        dmas = <&dmac1 0x91>, <&dmac1 0x90>,
                               <&dmac2 0x91>, <&dmac2 0x90>;
                        dma-names = "tx", "rx", "tx", "rx";
                        interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 930>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 930>;
                        dmas = <&dmac1 0x93>, <&dmac1 0x92>,
                               <&dmac2 0x93>, <&dmac2 0x92>;
                        dma-names = "tx", "rx", "tx", "rx";
                        interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 929>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 929>;
                        dmas = <&dmac1 0x95>, <&dmac1 0x94>,
                               <&dmac2 0x95>, <&dmac2 0x94>;
                        dma-names = "tx", "rx", "tx", "rx";
                        interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 928>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 928>;
                        dmas = <&dmac0 0x97>, <&dmac0 0x96>;
                        dma-names = "tx", "rx";
                        i2c-scl-internal-delay-ns = <110>;
                        interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 927>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 927>;
                        dmas = <&dmac0 0x99>, <&dmac0 0x98>;
                        dma-names = "tx", "rx";
                        i2c-scl-internal-delay-ns = <110>;
                        interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 919>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 919>;
                        dmas = <&dmac0 0x9b>, <&dmac0 0x9a>;
                        dma-names = "tx", "rx";
                        i2c-scl-internal-delay-ns = <110>;
                        interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 918>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 918>;
                        dmas = <&dmac0 0x9d>, <&dmac0 0x9c>;
                        dma-names = "tx", "rx";
                        i2c-scl-internal-delay-ns = <6>;
                        assigned-clocks = <&cpg CPG_CORE R8A7796_CLK_CANFD>;
                        assigned-clock-rates = <40000000>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 916>;
                        status = "disabled";
                };
 
                        assigned-clocks = <&cpg CPG_CORE R8A7796_CLK_CANFD>;
                        assigned-clock-rates = <40000000>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 915>;
                        status = "disabled";
                };
 
                        assigned-clocks = <&cpg CPG_CORE R8A7796_CLK_CANFD>;
                        assigned-clock-rates = <40000000>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 914>;
                        status = "disabled";
 
                        channel0 {
                                          "ch24";
                        clocks = <&cpg CPG_MOD 812>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 812>;
                        phy-mode = "rgmii-txid";
                        #address-cells = <1>;
                        #size-cells = <0>;
                               <&dmac2 0x31>, <&dmac2 0x30>;
                        dma-names = "tx", "rx", "tx", "rx";
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 520>;
                        status = "disabled";
                };
 
                               <&dmac2 0x33>, <&dmac2 0x32>;
                        dma-names = "tx", "rx", "tx", "rx";
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 519>;
                        status = "disabled";
                };
 
                               <&dmac2 0x35>, <&dmac2 0x34>;
                        dma-names = "tx", "rx", "tx", "rx";
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 518>;
                        status = "disabled";
                };
 
                        dmas = <&dmac0 0x37>, <&dmac0 0x36>;
                        dma-names = "tx", "rx";
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 517>;
                        status = "disabled";
                };
 
                        dmas = <&dmac0 0x39>, <&dmac0 0x38>;
                        dma-names = "tx", "rx";
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 516>;
                        status = "disabled";
                };
 
                               <&dmac2 0x51>, <&dmac2 0x50>;
                        dma-names = "tx", "rx", "tx", "rx";
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 207>;
                        status = "disabled";
                };
 
                               <&dmac2 0x53>, <&dmac2 0x52>;
                        dma-names = "tx", "rx", "tx", "rx";
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 206>;
                        status = "disabled";
                };
 
                                 <&scif_clk>;
                        clock-names = "fck", "brg_int", "scif_clk";
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 310>;
                        status = "disabled";
                };
 
                        dmas = <&dmac0 0x57>, <&dmac0 0x56>;
                        dma-names = "tx", "rx";
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 204>;
                        status = "disabled";
                };
 
                        dmas = <&dmac0 0x59>, <&dmac0 0x58>;
                        dma-names = "tx", "rx";
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 203>;
                        status = "disabled";
                };
 
                               <&dmac2 0x5b>, <&dmac2 0x5a>;
                        dma-names = "tx", "rx", "tx", "rx";
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 202>;
                        status = "disabled";
                };
 
                               <&dmac2 0x41>, <&dmac2 0x40>;
                        dma-names = "tx", "rx";
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 211>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        status = "disabled";
                               <&dmac2 0x43>, <&dmac2 0x42>;
                        dma-names = "tx", "rx";
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 210>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        status = "disabled";
                        dmas = <&dmac0 0x45>, <&dmac0 0x44>;
                        dma-names = "tx", "rx";
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 209>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        status = "disabled";
                        dmas = <&dmac0 0x47>, <&dmac0 0x46>;
                        dma-names = "tx", "rx";
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 208>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        status = "disabled";
                        clocks = <&cpg CPG_MOD 219>;
                        clock-names = "fck";
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 219>;
                        #dma-cells = <1>;
                        dma-channels = <16>;
                };
                        clocks = <&cpg CPG_MOD 218>;
                        clock-names = "fck";
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 218>;
                        #dma-cells = <1>;
                        dma-channels = <16>;
                };
                        clocks = <&cpg CPG_MOD 217>;
                        clock-names = "fck";
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 217>;
                        #dma-cells = <1>;
                        dma-channels = <16>;
                };
                        clocks = <&cpg CPG_MOD 314>;
                        max-frequency = <200000000>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 314>;
                        status = "disabled";
                };
 
                        clocks = <&cpg CPG_MOD 313>;
                        max-frequency = <200000000>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 313>;
                        status = "disabled";
                };
 
                        clocks = <&cpg CPG_MOD 312>;
                        max-frequency = <200000000>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 312>;
                        status = "disabled";
                };
 
                        clocks = <&cpg CPG_MOD 311>;
                        max-frequency = <200000000>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 311>;
                        status = "disabled";
                };
 
                                     <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 522>;
                        power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+                       resets = <&cpg 522>;
                        #thermal-sensor-cells = <1>;
                        status = "okay";
                };