ARM: dts: imx: update #interrupt-cells for gpio nodes

Change the value of #interrupt-cells of gpio nodes from 1 to 2, so that
the gpio irq type can be specified in device tree.  Also update binding
document to make it clear.

Reported-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

diff --git a/Documentation/devicetree/bindings/gpio/fsl-imx-gpio.txt b/Documentation/devicetree/bindings/gpio/fsl-imx-gpio.txt
index 5f360e7cdd324901246155cbece7d3bc3c46e102..4f3929713ae4d16df7f5f55dbb70459a8df02c76 100644 (file)
--- a/Documentation/devicetree/bindings/gpio/fsl-imx-gpio.txt
+++ b/Documentation/devicetree/bindings/gpio/fsl-imx-gpio.txt
@@ -11,6 +11,13 @@ Required properties:
   the second cell is used to specify the gpio polarity:
       0 = active high
       1 = active low
+- interrupt-controller: Marks the device node as an interrupt controller.
+- #interrupt-cells : Should be 2.  The first cell is the GPIO number.
+  The second cell bits[3:0] is used to specify trigger type and level flags:
+      1 = low-to-high edge triggered.
+      2 = high-to-low edge triggered.
+      4 = active high level-sensitive.
+      8 = active low level-sensitive.
 
 Example:
 
@@ -20,4 +27,6 @@ gpio0: gpio@73f84000 {
        interrupts = <50 51>;
        gpio-controller;
        #gpio-cells = <2>;
+       interrupt-controller;
+       #interrupt-cells = <2>;
 };

diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
index 386c769c38d179dcb090bba33af5aeb6ec2f0a0a..00bae3aad5ab601f7a21adf4da8539aa48880781 100644 (file)
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
@@ -121,7 +121,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio2: gpio@10015100 {
@@ -131,7 +131,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio3: gpio@10015200 {
@@ -141,7 +141,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio4: gpio@10015300 {
@@ -151,7 +151,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio5: gpio@10015400 {
@@ -161,7 +161,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio6: gpio@10015500 {
@@ -171,7 +171,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        cspi3: cspi@10017000 {

diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index bfa65abe8ef29444f4a56ca88c7fa1fd05591a47..922adefdd29120d14e5c7456ddbf3d6144b26f11 100644 (file)
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -133,7 +133,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio2: gpio@73f88000 {
@@ -143,7 +143,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio3: gpio@73f8c000 {
@@ -153,7 +153,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio4: gpio@73f90000 {
@@ -163,7 +163,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        wdog@73f98000 { /* WDOG1 */

diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index e3e869470cd3e4f6dc5f56daf2645f85bf6f14bc..4e735edc78ed7b4f9b6e2389091a759330e5b18c 100644 (file)
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -135,7 +135,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio2: gpio@53f88000 {
@@ -145,7 +145,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio3: gpio@53f8c000 {
@@ -155,7 +155,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio4: gpio@53f90000 {
@@ -165,7 +165,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        wdog@53f98000 { /* WDOG1 */
@@ -203,7 +203,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio6: gpio@53fe0000 {
@@ -213,7 +213,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio7: gpio@53fe4000 {
@@ -223,7 +223,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        i2c@53fec000 { /* I2C3 */

diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index 16a3884ac9d723e298a65f3ee8e4771174de2e75..bf88fb77526a4bc073ea757ba9e01a7dc6b88ba9 100644 (file)
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -283,7 +283,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio2: gpio@020a0000 {
@@ -293,7 +293,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio3: gpio@020a4000 {
@@ -303,7 +303,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio4: gpio@020a8000 {
@@ -313,7 +313,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio5: gpio@020ac000 {
@@ -323,7 +323,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio6: gpio@020b0000 {
@@ -333,7 +333,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        gpio7: gpio@020b4000 {
@@ -343,7 +343,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                        };
 
                        kpp@020b8000 {