Skip to contentSkip to conversation

ARM: ux500: correct typo in pinctrl Device Tree node

PATCH In review Linus Walleij 4 participants 6 messages Jan 30, 2013

Subsystems (5)
Device tree bindings Arm (32-bit) Arm sub-architectures Pin control +1 more subsystems
lore
Share & tools
lore

Linus Walleij

author
#0 lore raw

PATCH 1/1 ARM: ux500: correct typo in pinctrl Device Tree node

From: Lee Jones <[email protected]>

The preference is to use '-' instead of '_' in compatible strings.

Signed-off-by Lee Jones <[email protected]>
Signed-off-by Linus Walleij <[email protected]>
---
 arch/arm/boot/dts/dbx5x0.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/dbx5x0.dtsi +1 -1
index 96f518b..69140ba 100644
@@ -171,7 +171,7 @@
 		};
 
 		pinctrl {
-			compatible = "stericsson,nmk_pinctrl";
+			compatible = "stericsson,nmk-pinctrl";
 			prcm = <&prcmu>;
 		};
Signature · 1 line
1.7.11.3
#1 lore raw

arch/arm/boot/dts/dbx5x0.dtsi line 174

Quoted 7 lines · Linus Walleij

The preference is to use '-' instead of '_' in compatible strings.

arch/arm/boot/dts/dbx5x0.dtsi +1 -1
 
 		pinctrl {
-			compatible = "stericsson,nmk_pinctrl";
+			compatible = "stericsson,nmk-pinctrl";

Is there a driver-side patch which this depends on too?

#2 lore raw
Quoted 10 lines · Stephen Warren

arch/arm/boot/dts/dbx5x0.dtsi line 174

Quoted 7 lines · Linus Walleij

The preference is to use '-' instead of '_' in compatible strings.

arch/arm/boot/dts/dbx5x0.dtsi +1 -1
 
 		pinctrl {
-			compatible = "stericsson,nmk_pinctrl";
+			compatible = "stericsson,nmk-pinctrl";

Is there a driver-side patch which this depends on too?

This seems very strange.

I'm going to reply to this email again with how the patch should look.

Signature · 4 lines
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#3 lore raw

PATCH 1/1 pinctrl: nomadik: Rename Device Tree compatible string

In reply to Stephen Warren

The preference is to use '-' instead of '_' in compatible strings.

Signed-off-by Lee Jones <[email protected]>
Acked-by Linus Walleij <[email protected]>
---
 arch/arm/boot/dts/dbx5x0.dtsi     |    2 +-
 arch/arm/mach-ux500/cpu-db8500.c  |    2 +-
 drivers/pinctrl/pinctrl-nomadik.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/dbx5x0.dtsi +1 -1
index 3381ba6..b6256f3 100644
@@ -171,7 +171,7 @@
 		};
 
 		pinctrl {
-			compatible = "stericsson,nmk_pinctrl";
+			compatible = "stericsson,nmk-pinctrl";
 			prcm = <&prcmu>;
 		};
arch/arm/mach-ux500/cpu-db8500.c +1 -1
index 5b286e0..b80ad96 100644
@@ -285,7 +285,7 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
 	OF_DEV_AUXDATA("st,nomadik-i2c", 0x80110000, "nmk-i2c.3", NULL),
 	OF_DEV_AUXDATA("st,nomadik-i2c", 0x8012a000, "nmk-i2c.4", NULL),
 	/* Requires device name bindings. */
-	OF_DEV_AUXDATA("stericsson,nmk_pinctrl", U8500_PRCMU_BASE,
+	OF_DEV_AUXDATA("stericsson,nmk-pinctrl", U8500_PRCMU_BASE,
 		"pinctrl-db8500", NULL),
 	/* Requires clock name and DMA bindings. */
 	OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80123000,
drivers/pinctrl/pinctrl-nomadik.c +1 -1
index 4954302..2081931 100644
@@ -1847,7 +1847,7 @@ static struct pinctrl_desc nmk_pinctrl_desc = {
 
 static const struct of_device_id nmk_pinctrl_match[] = {
 	{
-		.compatible = "stericsson,nmk_pinctrl",
+		.compatible = "stericsson,nmk-pinctrl",
 		.data = (void *)PINCTRL_NMK_DB8500,
 	},
 	{},
Signature · 1 line
1.7.9.5
#4 lore raw

Re: [PATCH 1/1] pinctrl: nomadik: Rename Device Tree compatible string

Quoted 1 line · Lee Jones

The preference is to use '-' instead of '_' in compatible strings.

OK, this version seems complete. One issue here is that older device trees now won't work with newer kernels since the driver's support of the original compatible value is removed. DT is supposed to be backwards compatible, but perhaps at this earlyish stage you don't care about this on your platform yet?

Reviewed-by Stephen Warren Reviewed-by Philippe Langlais on v1 1/1
#5 lore raw

Re: [PATCH 1/1] pinctrl: nomadik: Rename Device Tree compatible string

In reply to Lee Jones
Quoted 4 lines · Lee Jones

The preference is to use '-' instead of '_' in compatible strings.

Signed-off-by Lee Jones <[email protected]>
Acked-by Linus Walleij <[email protected]>

This does not apply to pinctrl devel. (Same as linux-next)

This is because the two hunks, as compared to the last patch, were already in-tree, they were changed as part of patch:

commit e32af889458837d11a1ec5ec98934a1e711b049d

Author: Gabriel Fernandez <[email protected]>
Date:   Mon Dec 17 15:53:24 2012 +0100

pinctrl/nomadik: add device tree support

This implements pin multiplexing and pin configuration for the Nomadik pin controller using the device tree.

Signed-off-by Gabriel Fernandez <[email protected]>
Reviewed-by Stephen Warren <[email protected]>
Reviewed-by Philippe Langlais <[email protected]>
Signed-off-by Linus Walleij <[email protected]>

Since I don't dare to squash this oneliner into that patch for fear of Lee's rage, I leave the old patch as it is.

Yours,
Linus Walleij