Skip to content

L
linux
Commit 88cde8b7 authored by Shawn Guo's avatar Shawn Guo
Browse files
Options

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: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent c1cb4385
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 24 deletions
Documentation/devicetree/bindings/gpio/fsl-imx-gpio.txt
View file @ 88cde8b7
...@@ -11,6 +11,13 @@ Required properties: ...@@ -11,6 +11,13 @@ Required properties:
the second cell is used to specify the gpio polarity: the second cell is used to specify the gpio polarity:
0 = active high 0 = active high
1 = active low 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: Example:
...@@ -20,4 +27,6 @@ gpio0: gpio@73f84000 { ...@@ -20,4 +27,6 @@ gpio0: gpio@73f84000 {
interrupts = <50 51>; interrupts = <50 51>;
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
}; };
arch/arm/boot/dts/imx27.dtsi
View file @ 88cde8b7
...@@ -121,7 +121,7 @@ gpio1: gpio@10015000 { ...@@ -121,7 +121,7 @@ gpio1: gpio@10015000 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <2>;
}; };
gpio2: gpio@10015100 { gpio2: gpio@10015100 {
...@@ -131,7 +131,7 @@ gpio2: gpio@10015100 { ...@@ -131,7 +131,7 @@ gpio2: gpio@10015100 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <2>;
}; };
gpio3: gpio@10015200 { gpio3: gpio@10015200 {
...@@ -141,7 +141,7 @@ gpio3: gpio@10015200 { ...@@ -141,7 +141,7 @@ gpio3: gpio@10015200 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <2>;
}; };
gpio4: gpio@10015300 { gpio4: gpio@10015300 {
...@@ -151,7 +151,7 @@ gpio4: gpio@10015300 { ...@@ -151,7 +151,7 @@ gpio4: gpio@10015300 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <2>;
}; };
gpio5: gpio@10015400 { gpio5: gpio@10015400 {
...@@ -161,7 +161,7 @@ gpio5: gpio@10015400 { ...@@ -161,7 +161,7 @@ gpio5: gpio@10015400 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <2>;
}; };
gpio6: gpio@10015500 { gpio6: gpio@10015500 {
...@@ -171,7 +171,7 @@ gpio6: gpio@10015500 { ...@@ -171,7 +171,7 @@ gpio6: gpio@10015500 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <2>;
}; };
cspi3: cspi@10017000 { cspi3: cspi@10017000 {
......
arch/arm/boot/dts/imx51.dtsi
View file @ 88cde8b7
...@@ -133,7 +133,7 @@ gpio1: gpio@73f84000 { ...@@ -133,7 +133,7 @@ gpio1: gpio@73f84000 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <2>;
}; };
gpio2: gpio@73f88000 { gpio2: gpio@73f88000 {
...@@ -143,7 +143,7 @@ gpio2: gpio@73f88000 { ...@@ -143,7 +143,7 @@ gpio2: gpio@73f88000 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <2>;
}; };
gpio3: gpio@73f8c000 { gpio3: gpio@73f8c000 {
...@@ -153,7 +153,7 @@ gpio3: gpio@73f8c000 { ...@@ -153,7 +153,7 @@ gpio3: gpio@73f8c000 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <2>;
}; };
gpio4: gpio@73f90000 { gpio4: gpio@73f90000 {
...@@ -163,7 +163,7 @@ gpio4: gpio@73f90000 { ...@@ -163,7 +163,7 @@ gpio4: gpio@73f90000 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <2>;
}; };
wdog@73f98000 { /* WDOG1 */ wdog@73f98000 { /* WDOG1 */
......
arch/arm/boot/dts/imx53.dtsi
View file @ 88cde8b7
...@@ -135,7 +135,7 @@ gpio1: gpio@53f84000 { ...@@ -135,7 +135,7 @@ gpio1: gpio@53f84000 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <2>;
}; };
gpio2: gpio@53f88000 { gpio2: gpio@53f88000 {
...@@ -145,7 +145,7 @@ gpio2: gpio@53f88000 { ...@@ -145,7 +145,7 @@ gpio2: gpio@53f88000 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <2>;
}; };
gpio3: gpio@53f8c000 { gpio3: gpio@53f8c000 {
...@@ -155,7 +155,7 @@ gpio3: gpio@53f8c000 { ...@@ -155,7 +155,7 @@ gpio3: gpio@53f8c000 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <2>;
}; };
gpio4: gpio@53f90000 { gpio4: gpio@53f90000 {
...@@ -165,7 +165,7 @@ gpio4: gpio@53f90000 { ...@@ -165,7 +165,7 @@ gpio4: gpio@53f90000 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <2>;
}; };
wdog@53f98000 { /* WDOG1 */ wdog@53f98000 { /* WDOG1 */
...@@ -203,7 +203,7 @@ gpio5: gpio@53fdc000 { ...@@ -203,7 +203,7 @@ gpio5: gpio@53fdc000 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <2>;
}; };
gpio6: gpio@53fe0000 { gpio6: gpio@53fe0000 {
...@@ -213,7 +213,7 @@ gpio6: gpio@53fe0000 { ...@@ -213,7 +213,7 @@ gpio6: gpio@53fe0000 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <2>;
}; };
gpio7: gpio@53fe4000 { gpio7: gpio@53fe4000 {
...@@ -223,7 +223,7 @@ gpio7: gpio@53fe4000 { ...@@ -223,7 +223,7 @@ gpio7: gpio@53fe4000 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <2>;
}; };
i2c@53fec000 { /* I2C3 */ i2c@53fec000 { /* I2C3 */
......
arch/arm/boot/dts/imx6q.dtsi
View file @ 88cde8b7
...@@ -283,7 +283,7 @@ gpio1: gpio@0209c000 { ...@@ -283,7 +283,7 @@ gpio1: gpio@0209c000 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <2>;
}; };
gpio2: gpio@020a0000 { gpio2: gpio@020a0000 {
...@@ -293,7 +293,7 @@ gpio2: gpio@020a0000 { ...@@ -293,7 +293,7 @@ gpio2: gpio@020a0000 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <2>;
}; };
gpio3: gpio@020a4000 { gpio3: gpio@020a4000 {
...@@ -303,7 +303,7 @@ gpio3: gpio@020a4000 { ...@@ -303,7 +303,7 @@ gpio3: gpio@020a4000 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <2>;
}; };
gpio4: gpio@020a8000 { gpio4: gpio@020a8000 {
...@@ -313,7 +313,7 @@ gpio4: gpio@020a8000 { ...@@ -313,7 +313,7 @@ gpio4: gpio@020a8000 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <2>;
}; };
gpio5: gpio@020ac000 { gpio5: gpio@020ac000 {
...@@ -323,7 +323,7 @@ gpio5: gpio@020ac000 { ...@@ -323,7 +323,7 @@ gpio5: gpio@020ac000 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <2>;
}; };
gpio6: gpio@020b0000 { gpio6: gpio@020b0000 {
...@@ -333,7 +333,7 @@ gpio6: gpio@020b0000 { ...@@ -333,7 +333,7 @@ gpio6: gpio@020b0000 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <2>;
}; };
gpio7: gpio@020b4000 { gpio7: gpio@020b4000 {
...@@ -343,7 +343,7 @@ gpio7: gpio@020b4000 { ...@@ -343,7 +343,7 @@ gpio7: gpio@020b4000 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <2>;
}; };
kpp@020b8000 { kpp@020b8000 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7