Merge tag 'gpio-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[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 4e735ed..fc79cdc 100644 (file)
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -129,7 +129,7 @@
                        };
 
                        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;
@@ -139,7 +139,7 @@
                        };
 
                        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;
@@ -149,7 +149,7 @@
                        };
 
                        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;
@@ -159,7 +159,7 @@
                        };
 
                        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;
@@ -197,7 +197,7 @@
                        };
 
                        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;
@@ -207,7 +207,7 @@
                        };
 
                        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;
@@ -217,7 +217,7 @@
                        };
 
                        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;