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

[~andy/linux] / arch / arm / boot / dts / imx51.dtsi

diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index bfa65abe8ef29444f4a56ca88c7fa1fd05591a47..aaa0c0a4ca8fa0e18dafecf4fac9308ed7330513 100644 (file)
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -17,6 +17,10 @@
                serial0 = &uart1;
                serial1 = &uart2;
                serial2 = &uart3;
+               gpio0 = &gpio1;
+               gpio1 = &gpio2;
+               gpio2 = &gpio3;
+               gpio3 = &gpio4;
        };
 
        tzic: tz-interrupt-controller@e0000000 {
@@ -127,43 +131,43 @@
                        };
 
                        gpio1: gpio@73f84000 {
-                               compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";
+                               compatible = "fsl,imx51-gpio", "fsl,imx35-gpio";
                                reg = <0x73f84000 0x4000>;
                                interrupts = <50 51>;
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio2: gpio@73f88000 {
-                               compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";
+                               compatible = "fsl,imx51-gpio", "fsl,imx35-gpio";
                                reg = <0x73f88000 0x4000>;
                                interrupts = <52 53>;
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio3: gpio@73f8c000 {
-                               compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";
+                               compatible = "fsl,imx51-gpio", "fsl,imx35-gpio";
                                reg = <0x73f8c000 0x4000>;
                                interrupts = <54 55>;
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio4: gpio@73f90000 {
-                               compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";
+                               compatible = "fsl,imx51-gpio", "fsl,imx35-gpio";
                                reg = <0x73f90000 0x4000>;
                                interrupts = <56 57>;
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        wdog@73f98000 { /* WDOG1 */
@@ -259,6 +263,13 @@
                                status = "disabled";
                        };
 
+                       nand@83fdb000 {
+                               compatible = "fsl,imx51-nand";
+                               reg = <0x83fdb000 0x1000 0xcfff0000 0x10000>;
+                               interrupts = <8>;
+                               status = "disabled";
+                       };
+
                        ssi3: ssi@83fe8000 {
                                compatible = "fsl,imx51-ssi", "fsl,imx21-ssi";
                                reg = <0x83fe8000 0x4000>;