Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d5776d5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents e95f2e79 9d5f6b51

Documentation/devicetree/bindings/gpio/fsl-imx-gpio.txt

+12 −2
Original line number Diff line number Diff line
@@ -8,8 +8,16 @@ Required properties: 
  by low 16 pins and the second one is for high 16 pins.

- gpio-controller : Marks the device node as a gpio controller.

- #gpio-cells : Should be two.  The first cell is the pin number and

  the second cell is used to specify optional parameters (currently

  unused).

  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:
@@ -19,4 +27,6 @@ gpio0: gpio@73f84000 { 
	interrupts = <50 51>;

	gpio-controller;

	#gpio-cells = <2>;

	interrupt-controller;

	#interrupt-cells = <2>;

};

Documentation/devicetree/bindings/gpio/gpio-mxs.txt

+3 −2
Original line number Diff line number Diff line
@@ -13,8 +13,9 @@ Required properties for GPIO node: 
- interrupts : Should be the port interrupt shared by all 32 pins.

- gpio-controller : Marks the device node as a gpio controller.

- #gpio-cells : Should be two.  The first cell is the pin number and

  the second cell is used to specify optional parameters (currently

  unused).

  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:

arch/arm/boot/dts/imx27.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -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 {

arch/arm/boot/dts/imx51.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -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 */

arch/arm/boot/dts/imx53.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -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 */