Merge branch 'cpuidle' into release

[karo-tx-linux.git] / arch / arm / boot / dts / r8a73a4.dtsi

diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
index 7ee22a41c6c974888a69f88542ed039ab9d09591..cb4f7b2798fe23be13facdffaef64430cf168ab1 100644 (file)
--- a/arch/arm/boot/dts/r8a73a4.dtsi
+++ b/arch/arm/boot/dts/r8a73a4.dtsi
@@ -207,6 +207,13 @@
                reg = <0 0xe6050000 0 0x9000>;
                gpio-controller;
                #gpio-cells = <2>;
+               gpio-ranges =
+                       <&pfc 0 0 31>, <&pfc 32 32 9>,
+                       <&pfc 64 64 22>, <&pfc 96 96 31>,
+                       <&pfc 128 128 7>, <&pfc 160 160 19>,
+                       <&pfc 192 192 31>, <&pfc 224 224 27>,
+                       <&pfc 256 256 28>, <&pfc 288 288 21>,
+                       <&pfc 320 320 10>;
                interrupts-extended =
                        <&irqc0  0 0>, <&irqc0  1 0>, <&irqc0  2 0>, <&irqc0  3 0>,
                        <&irqc0  4 0>, <&irqc0  5 0>, <&irqc0  6 0>, <&irqc0  7 0>,
@@ -434,7 +441,7 @@
        };
 
        gic: interrupt-controller@f1001000 {
-               compatible = "arm,cortex-a15-gic";
+               compatible = "arm,gic-400";
                #interrupt-cells = <3>;
                #address-cells = <0>;
                interrupt-controller;