Merge tag 'v4.4-rc1' into HEAD

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / r8a7790.dtsi

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index e07ae5d45e19ffd5e05cb6ce1e6cdcb7c238b649..9f3036b80c0e8c9f98b1d2ab4b5292c5b5be0f94 100644 (file)
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -143,7 +143,7 @@
                interrupts = <0 5 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
                gpio-controller;
-               gpio-ranges = <&pfc 0 32 32>;
+               gpio-ranges = <&pfc 0 32 30>;
                #interrupt-cells = <2>;
                interrupt-controller;
                clocks = <&mstp9_clks R8A7790_CLK_GPIO1>;
@@ -156,7 +156,7 @@
                interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
                gpio-controller;
-               gpio-ranges = <&pfc 0 64 32>;
+               gpio-ranges = <&pfc 0 64 30>;
                #interrupt-cells = <2>;
                interrupt-controller;
                clocks = <&mstp9_clks R8A7790_CLK_GPIO2>;
@@ -266,7 +266,7 @@
        };
 
        dmac0: dma-controller@e6700000 {
-               compatible = "renesas,rcar-dmac";
+               compatible = "renesas,dmac-r8a7790", "renesas,rcar-dmac";
                reg = <0 0xe6700000 0 0x20000>;
                interrupts = <0 197 IRQ_TYPE_LEVEL_HIGH
                              0 200 IRQ_TYPE_LEVEL_HIGH
@@ -297,7 +297,7 @@
        };
 
        dmac1: dma-controller@e6720000 {
-               compatible = "renesas,rcar-dmac";
+               compatible = "renesas,dmac-r8a7790", "renesas,rcar-dmac";
                reg = <0 0xe6720000 0 0x20000>;
                interrupts = <0 220 IRQ_TYPE_LEVEL_HIGH
                              0 216 IRQ_TYPE_LEVEL_HIGH
@@ -328,7 +328,7 @@
        };
 
        audma0: dma-controller@ec700000 {
-               compatible = "renesas,rcar-dmac";
+               compatible = "renesas,dmac-r8a7790", "renesas,rcar-dmac";
                reg = <0 0xec700000 0 0x10000>;
                interrupts =    <0 346 IRQ_TYPE_LEVEL_HIGH
                                 0 320 IRQ_TYPE_LEVEL_HIGH
@@ -357,7 +357,7 @@
        };
 
        audma1: dma-controller@ec720000 {
-               compatible = "renesas,rcar-dmac";
+               compatible = "renesas,dmac-r8a7790", "renesas,rcar-dmac";
                reg = <0 0xec720000 0 0x10000>;
                interrupts =    <0 347 IRQ_TYPE_LEVEL_HIGH
                                 0 333 IRQ_TYPE_LEVEL_HIGH