Merge tag 'v3.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

[cascardo/linux.git] / arch / arm / boot / dts / imx53.dtsi

diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 2b5caf9..dc00c62 100644 (file)
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -19,6 +19,13 @@
                serial2 = &uart3;
                serial3 = &uart4;
                serial4 = &uart5;
+               gpio0 = &gpio1;
+               gpio1 = &gpio2;
+               gpio2 = &gpio3;
+               gpio3 = &gpio4;
+               gpio4 = &gpio5;
+               gpio5 = &gpio6;
+               gpio6 = &gpio7;
        };
 
        tzic: tz-interrupt-controller@0fffc000 {
@@ -129,43 +136,43 @@
                        };
 
                        gpio1: gpio@53f84000 {
-                               compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
+                               compatible = "fsl,imx53-gpio", "fsl,imx35-gpio";
                                reg = <0x53f84000 0x4000>;
                                interrupts = <50 51>;
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio2: gpio@53f88000 {
-                               compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
+                               compatible = "fsl,imx53-gpio", "fsl,imx35-gpio";
                                reg = <0x53f88000 0x4000>;
                                interrupts = <52 53>;
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio3: gpio@53f8c000 {
-                               compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
+                               compatible = "fsl,imx53-gpio", "fsl,imx35-gpio";
                                reg = <0x53f8c000 0x4000>;
                                interrupts = <54 55>;
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio4: gpio@53f90000 {
-                               compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
+                               compatible = "fsl,imx53-gpio", "fsl,imx35-gpio";
                                reg = <0x53f90000 0x4000>;
                                interrupts = <56 57>;
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        wdog@53f98000 { /* WDOG1 */
@@ -197,33 +204,33 @@
                        };
 
                        gpio5: gpio@53fdc000 {
-                               compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
+                               compatible = "fsl,imx53-gpio", "fsl,imx35-gpio";
                                reg = <0x53fdc000 0x4000>;
                                interrupts = <103 104>;
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio6: gpio@53fe0000 {
-                               compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
+                               compatible = "fsl,imx53-gpio", "fsl,imx35-gpio";
                                reg = <0x53fe0000 0x4000>;
                                interrupts = <105 106>;
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio7: gpio@53fe4000 {
-                               compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
+                               compatible = "fsl,imx53-gpio", "fsl,imx35-gpio";
                                reg = <0x53fe4000 0x4000>;
                                interrupts = <107 108>;
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        i2c@53fec000 { /* I2C3 */