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

Commit ff5c9059 authored by Jon Hunter's avatar Jon Hunter Committed by Benoit Cousson
Browse files

ARM: dts: OMAP3+: Correct gpio #interrupts-cells property 



The OMAP gpio binding documention [1] states that the #interrupts-cells
property for gpio controllers should be 2. Currently, for OMAP3+ devices
the #interrupt-cells is set to 1. By setting this property to 2, it
allows clients to pass a 2nd parameter indicating the sensitivity (level
or edge) and polarity (high or low) of the interrupt. The OMAP gpio
controllers support these options and so update the #interrupt-cells
property for OMAP3+ devices to 2.

[1] Documentation/devicetree/bindings/gpio/gpio-omap.txt

Signed-off-by: default avatarJon Hunter <jon-hunter@ti.com>
Signed-off-by: default avatarBenoit Cousson <benoit.cousson@linaro.org>
parent 423182e3

arch/arm/boot/dts/omap3.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio2: gpio@49050000 {
@@ -126,7 +126,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio3: gpio@49052000 {
@@ -135,7 +135,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio4: gpio@49054000 {
@@ -144,7 +144,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio5: gpio@49056000 {
@@ -153,7 +153,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio6: gpio@49058000 {
@@ -162,7 +162,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		uart1: serial@4806a000 {

arch/arm/boot/dts/omap4.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio2: gpio@48055000 {
@@ -149,7 +149,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio3: gpio@48057000 {
@@ -160,7 +160,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio4: gpio@48059000 {
@@ -171,7 +171,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio5: gpio@4805b000 {
@@ -182,7 +182,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio6: gpio@4805d000 {
@@ -193,7 +193,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpmc: gpmc@50000000 {

arch/arm/boot/dts/omap5.dtsi

+8 −8
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio2: gpio@48055000 {
@@ -139,7 +139,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio3: gpio@48057000 {
@@ -150,7 +150,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio4: gpio@48059000 {
@@ -161,7 +161,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio5: gpio@4805b000 {
@@ -172,7 +172,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio6: gpio@4805d000 {
@@ -183,7 +183,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio7: gpio@48051000 {
@@ -194,7 +194,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio8: gpio@48053000 {
@@ -205,7 +205,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpmc: gpmc@50000000 {