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

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

diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index c25d49584814aade377b4c57f964967ec1f71a09..3d3c64b014e61f9978072571343f6b84afb5f523 100644 (file)
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -277,7 +277,7 @@
                        };
 
                        gpio1: gpio@0209c000 {
-                               compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
+                               compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
                                reg = <0x0209c000 0x4000>;
                                interrupts = <0 66 0x04 0 67 0x04>;
                                gpio-controller;
@@ -287,7 +287,7 @@
                        };
 
                        gpio2: gpio@020a0000 {
-                               compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
+                               compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
                                reg = <0x020a0000 0x4000>;
                                interrupts = <0 68 0x04 0 69 0x04>;
                                gpio-controller;
@@ -297,7 +297,7 @@
                        };
 
                        gpio3: gpio@020a4000 {
-                               compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
+                               compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
                                reg = <0x020a4000 0x4000>;
                                interrupts = <0 70 0x04 0 71 0x04>;
                                gpio-controller;
@@ -307,7 +307,7 @@
                        };
 
                        gpio4: gpio@020a8000 {
-                               compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
+                               compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
                                reg = <0x020a8000 0x4000>;
                                interrupts = <0 72 0x04 0 73 0x04>;
                                gpio-controller;
@@ -317,7 +317,7 @@
                        };
 
                        gpio5: gpio@020ac000 {
-                               compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
+                               compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
                                reg = <0x020ac000 0x4000>;
                                interrupts = <0 74 0x04 0 75 0x04>;
                                gpio-controller;
@@ -327,7 +327,7 @@
                        };
 
                        gpio6: gpio@020b0000 {
-                               compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
+                               compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
                                reg = <0x020b0000 0x4000>;
                                interrupts = <0 76 0x04 0 77 0x04>;
                                gpio-controller;
@@ -337,7 +337,7 @@
                        };
 
                        gpio7: gpio@020b4000 {
-                               compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
+                               compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
                                reg = <0x020b4000 0x4000>;
                                interrupts = <0 78 0x04 0 79 0x04>;
                                gpio-controller;