[PATCH v2 0/2] ARM: dts: AM33xx: Correct gpio labels to match docs

[PATCH v2 0/2] ARM: dts: AM33xx: Correct gpio labels to match docs

[Matt Porter]

Changes since v1:
	- Series now applies on top of Anil's AM33XX DTS series
 
This series applies on top of the for_3.7/dts/ branch and Anil's
"[v7,2/3] arm/dts: AM33XX: Configure pinmuxs for user leds control on Bone"
patch that is part of the overall series adding led and pinctrl DTS data
for AM33xx.

It is intended to correct the current labeling of gpios in the DTS before
too many more drivers are submitted for AM33xx that have gpios not matching
the docs.

Matt Porter (2):
  ARM: dts: AM33XX: fix gpio node numbering to match hardware
  ARM: dts: AM33XX: adjust leds to use the corrected gpio label

 arch/arm/boot/dts/am335x-bone.dts |    8 ++++----
 arch/arm/boot/dts/am33xx.dtsi     |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

-- 
1.7.9.5

[PATCH v2 1/2] ARM: dts: AM33XX: fix gpio node numbering to match hardware

[Matt Porter]

On AM33xx, the datasheet and TRM refer to four GPIO instances that
are 0-based, GPIO0-3.

Signed-off-by: Matt Porter <mporter-l0cyMroinI0@public.gmane.org>
---
 arch/arm/boot/dts/am33xx.dtsi |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index bb31bff..1369bfc 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -62,7 +62,7 @@
 			reg = <0x48200000 0x1000>;
 		};
 
-		gpio1: gpio@44e07000 {
+		gpio0: gpio@44e07000 {
 			compatible = "ti,omap4-gpio";
 			ti,hwmods = "gpio1";
 			gpio-controller;
@@ -74,7 +74,7 @@
 			interrupts = <96>;
 		};
 
-		gpio2: gpio@4804c000 {
+		gpio1: gpio@4804c000 {
 			compatible = "ti,omap4-gpio";
 			ti,hwmods = "gpio2";
 			gpio-controller;
@@ -86,7 +86,7 @@
 			interrupts = <98>;
 		};
 
-		gpio3: gpio@481ac000 {
+		gpio2: gpio@481ac000 {
 			compatible = "ti,omap4-gpio";
 			ti,hwmods = "gpio3";
 			gpio-controller;
@@ -98,7 +98,7 @@
 			interrupts = <32>;
 		};
 
-		gpio4: gpio@481ae000 {
+		gpio3: gpio@481ae000 {
 			compatible = "ti,omap4-gpio";
 			ti,hwmods = "gpio4";
 			gpio-controller;
-- 
1.7.9.5

RE: [PATCH v2 0/2] ARM: dts: AM33xx: Correct gpio labels to match docs

[Hiremath, Vaibhav]

On Tue, Sep 11, 2012 at 01:15:10, Porter, Matt wrote:
> Changes since v1:
> 	- Series now applies on top of Anil's AM33XX DTS series
>  
> This series applies on top of the for_3.7/dts/ branch and Anil's
> "[v7,2/3] arm/dts: AM33XX: Configure pinmuxs for user leds control on Bone"
> patch that is part of the overall series adding led and pinctrl DTS data
> for AM33xx.
> 
> It is intended to correct the current labeling of gpios in the DTS before
> too many more drivers are submitted for AM33xx that have gpios not matching
> the docs.
> 
> Matt Porter (2):
>   ARM: dts: AM33XX: fix gpio node numbering to match hardware
>   ARM: dts: AM33XX: adjust leds to use the corrected gpio label
> 

I have tested this series on BeagleBone, also validated LED functionality.

Tested-Acked-By: Vaibhav Hiremath <hvaibhav-l0cyMroinI0@public.gmane.org>

Thanks,
Vaibhav

>  arch/arm/boot/dts/am335x-bone.dts |    8 ++++----
>  arch/arm/boot/dts/am33xx.dtsi     |    8 ++++----
>  2 files changed, 8 insertions(+), 8 deletions(-)
> 
> -- 
> 1.7.9.5
> 
> 

[PATCH v2 2/2] ARM: dts: AM33XX: adjust leds to use the corrected gpio label

[Matt Porter]

With the am33xx.dtsi now using gpio labels that match the AM33xx
documentation, we need to refer to GPIO1 by the "gpio1" label.

Signed-off-by: Matt Porter <mporter@ti.com>
---
 arch/arm/boot/dts/am335x-bone.dts |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
index b0a7409..fa0c9d5 100644
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone.dts
@@ -41,27 +41,27 @@
 
 			heartbeat {
 				label = "beaglebone:green:usr0";
-				gpios = <&gpio2 21 0>;
+				gpios = <&gpio1 21 0>;
 				linux,default-trigger = "heartbeat";
 				default-state = "off";
 			};
 
 			mmc {
 				label = "beaglebone:green:usr1";
-				gpios = <&gpio2 22 0>;
+				gpios = <&gpio1 22 0>;
 				linux,default-trigger = "mmc0";
 				default-state = "off";
 			};
 
 			led2 {
 				label = "beaglebone:green:usr2";
-				gpios = <&gpio2 23 0>;
+				gpios = <&gpio1 23 0>;
 				default-state = "off";
 			};
 
 			led3 {
 				label = "beaglebone:green:usr3";
-				gpios = <&gpio2 24 0>;
+				gpios = <&gpio1 24 0>;
 				default-state = "off";
 			};
 		};
-- 
1.7.9.5