diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-07-12 08:49:00 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-12 11:37:05 -0400 |
commit | 8d5776d5fed6c3d2d5b5bce9512faa41321d6a8a (patch) | |
tree | 4cbb5a92c3d6a8d340fc817b2afcd167f865f312 /Documentation/devicetree/bindings/gpio | |
parent | e95f2e790e98c61eb88caa5ee31a04e1dc7a8c59 (diff) | |
parent | 9d5f6b51bdaff83b85069a2eee7a89c562a5daba (diff) |
Merge branch 'imx/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
From Shawn Guo <shawn.guo@linaro.org>:
Here is the second (last) batch of imx device tree changes for 3.6.
* 'imx/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: imx6q: ensure ANATOP controller is available
ARM: dts: imx6q-sabrelite: add ecspi1 pinctrl support
ARM: dts: imx6q-sabrelite: add usb devices
ARM: imx6q: disable usb charger detector
ARM: imx6q: add usbphy clocks
ARM: imx6q: add usb controller clock lookups
ARM: dts: imx: update #interrupt-cells for gpio nodes
bindings: update imx and mxs #gpio-cells
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/devicetree/bindings/gpio')
-rw-r--r-- | Documentation/devicetree/bindings/gpio/fsl-imx-gpio.txt | 14 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/gpio/gpio-mxs.txt | 5 |
2 files changed, 15 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/gpio/fsl-imx-gpio.txt b/Documentation/devicetree/bindings/gpio/fsl-imx-gpio.txt index 4363ae4b3c1..4f3929713ae 100644 --- a/Documentation/devicetree/bindings/gpio/fsl-imx-gpio.txt +++ b/Documentation/devicetree/bindings/gpio/fsl-imx-gpio.txt | |||
@@ -8,8 +8,16 @@ Required properties: | |||
8 | by low 16 pins and the second one is for high 16 pins. | 8 | by low 16 pins and the second one is for high 16 pins. |
9 | - gpio-controller : Marks the device node as a gpio controller. | 9 | - gpio-controller : Marks the device node as a gpio controller. |
10 | - #gpio-cells : Should be two. The first cell is the pin number and | 10 | - #gpio-cells : Should be two. The first cell is the pin number and |
11 | the second cell is used to specify optional parameters (currently | 11 | the second cell is used to specify the gpio polarity: |
12 | unused). | 12 | 0 = active high |
13 | 1 = active low | ||
14 | - interrupt-controller: Marks the device node as an interrupt controller. | ||
15 | - #interrupt-cells : Should be 2. The first cell is the GPIO number. | ||
16 | The second cell bits[3:0] is used to specify trigger type and level flags: | ||
17 | 1 = low-to-high edge triggered. | ||
18 | 2 = high-to-low edge triggered. | ||
19 | 4 = active high level-sensitive. | ||
20 | 8 = active low level-sensitive. | ||
13 | 21 | ||
14 | Example: | 22 | Example: |
15 | 23 | ||
@@ -19,4 +27,6 @@ gpio0: gpio@73f84000 { | |||
19 | interrupts = <50 51>; | 27 | interrupts = <50 51>; |
20 | gpio-controller; | 28 | gpio-controller; |
21 | #gpio-cells = <2>; | 29 | #gpio-cells = <2>; |
30 | interrupt-controller; | ||
31 | #interrupt-cells = <2>; | ||
22 | }; | 32 | }; |
diff --git a/Documentation/devicetree/bindings/gpio/gpio-mxs.txt b/Documentation/devicetree/bindings/gpio/gpio-mxs.txt index 0c35673f7a3..1e677a47b83 100644 --- a/Documentation/devicetree/bindings/gpio/gpio-mxs.txt +++ b/Documentation/devicetree/bindings/gpio/gpio-mxs.txt | |||
@@ -13,8 +13,9 @@ Required properties for GPIO node: | |||
13 | - interrupts : Should be the port interrupt shared by all 32 pins. | 13 | - interrupts : Should be the port interrupt shared by all 32 pins. |
14 | - gpio-controller : Marks the device node as a gpio controller. | 14 | - gpio-controller : Marks the device node as a gpio controller. |
15 | - #gpio-cells : Should be two. The first cell is the pin number and | 15 | - #gpio-cells : Should be two. The first cell is the pin number and |
16 | the second cell is used to specify optional parameters (currently | 16 | the second cell is used to specify the gpio polarity: |
17 | unused). | 17 | 0 = active high |
18 | 1 = active low | ||
18 | - interrupt-controller: Marks the device node as an interrupt controller. | 19 | - interrupt-controller: Marks the device node as an interrupt controller. |
19 | - #interrupt-cells : Should be 2. The first cell is the GPIO number. | 20 | - #interrupt-cells : Should be 2. The first cell is the GPIO number. |
20 | The second cell bits[3:0] is used to specify trigger type and level flags: | 21 | The second cell bits[3:0] is used to specify trigger type and level flags: |