[PATCH] ARM: nomadik: fix up leftover device tree pins

[PATCH] ARM: nomadik: fix up leftover device tree pins

[Linus Walleij]

We altered the device tree bindings for the Nomadik family of
pin controllers to be standard, this file was merged out-of-order
so we missed fixing this. Fix it up.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ARM SoC guys: please pick this directly for fixes, I have no
other Nomadik fixes for this merge window AFAIK.
---
 arch/arm/boot/dts/ste-nomadik-nhk15.dts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/ste-nomadik-nhk15.dts b/arch/arm/boot/dts/ste-nomadik-nhk15.dts
index a1b9deecb23a..aba2efead02e 100644
--- a/arch/arm/boot/dts/ste-nomadik-nhk15.dts
+++ b/arch/arm/boot/dts/ste-nomadik-nhk15.dts
@@ -25,11 +25,11 @@
 		stmpe2401_1 {
 			stmpe2401_1_nhk_mode: stmpe2401_1_nhk {
 				nhk_cfg1 {
-					ste,pins = "GPIO76_B20"; // IRQ line
+					pins = "GPIO76_B20"; // IRQ line
 					ste,input = <0>;
 				};
 				nhk_cfg2 {
-					ste,pins = "GPIO77_B8"; // reset line
+					pins = "GPIO77_B8"; // reset line
 					ste,output = <1>;
 				};
 			};
@@ -37,11 +37,11 @@
 		stmpe2401_2 {
 			stmpe2401_2_nhk_mode: stmpe2401_2_nhk {
 				nhk_cfg1 {
-					ste,pins = "GPIO78_A8"; // IRQ line
+					pins = "GPIO78_A8"; // IRQ line
 					ste,input = <0>;
 				};
 				nhk_cfg2 {
-					ste,pins = "GPIO79_C9"; // reset line
+					pins = "GPIO79_C9"; // reset line
 					ste,output = <1>;
 				};
 			};
-- 
1.9.3

[PATCH] ARM: nomadik: fix up leftover device tree pins

[Olof Johansson]

On Fri, Jan 09, 2015 at 08:11:20PM +0100, Linus Walleij wrote:
> We altered the device tree bindings for the Nomadik family of
> pin controllers to be standard, this file was merged out-of-order
> so we missed fixing this. Fix it up.
> 
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> ARM SoC guys: please pick this directly for fixes, I have no
> other Nomadik fixes for this merge window AFAIK.

Thanks, applied to fixes.


-Olof