ARM: ux500: Change naming convention for pinctrl

PATCH In review Lee Jones 2 participants 18 messages May 22, 2013 – Jun 11, 2013

Subsystems (5)

Device tree bindings Arm (32-bit) Arm sub-architectures Pin control +1 more subsystems

lore

Share & tools

lore

Lee Jones

author

2013-05-22 14:22 UTC #0 lore raw

cover ARM: ux500: Change naming convention for pinctrl

Our naming convention started off sensibly, but with the addition of more supported platforms it's slipped a little. Most compatible strings standardise themselves with "<vendor>,<device_name>-<device_type>", which we had initially with "stericsson,nmk-pinctrl", but with more devices to support we now have a tail, so we are using "<vendor>,<driver_name>-<device_type>-<device_name>", which is unsuitable.

This patch-set ensures the standard convention is used again.

Lee Jones

author

2013-05-22 14:22 UTC #1 lore raw

PATCH 1/7 ARM: ux500: Standardise DBx5x0 based Pinctrl compat string in the DTS

Signed-off-by Lee Jones <[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 6c25fbe..d0835ca 100644
@@ -171,7 +171,7 @@
 		};
 
 		pinctrl {
-			compatible = "stericsson,nmk-pinctrl";
+			compatible = "stericsson,db8500-pinctrl";
 			prcm = <&prcmu>;
 		};

Signature · 1 line

1.7.10.4

Lee Jones

author

2013-05-22 14:22 UTC #2 lore raw

PATCH 2/7 ARM: ux500: Standardise Nomadik STN8815 based Pinctrl compat string in the DTS

In reply to Lee Jones

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

---
 arch/arm/boot/dts/ste-nomadik-stn8815.dtsi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/boot/dts/ste-nomadik-stn8815.dtsi +1 -1

index 4a4aab3..a6c2112 100644
@@ -84,7 +84,7 @@
 	};
 
 	pinctrl {
-		compatible = "stericsson,nmk-pinctrl-stn8815";
+		compatible = "stericsson,stn8815-pinctrl";
 	};
 
 	/* A NAND flash of 128 MiB */

Signature · 1 line

1.7.10.4

Linus Walleij

2013-05-28 14:26 UTC #3 lore raw

Re: [PATCH 2/7] ARM: ux500: Standardise Nomadik STN8815 based Pinctrl compat string in the DTS

Quoted 1 line · Lee Jones

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

Patch applied to my nomadik-dt branch.

Yours,
Linus Walleij

Lee Jones

author

2013-05-22 14:22 UTC #4 lore raw

PATCH 3/7 ARM: ux500: Standardise Pinctrl compatible string for Nomadik based platforms

In reply to Lee Jones

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

---
 arch/arm/mach-nomadik/cpu-8815.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/mach-nomadik/cpu-8815.c +1 -1

index 59f6ff5..316fe82 100644
@@ -288,7 +288,7 @@ static struct of_dev_auxdata cpu8815_auxdata_lookup[] __initdata = {
 		"gpio.2", NULL),
 	OF_DEV_AUXDATA("st,nomadik-gpio", NOMADIK_GPIO3_BASE,
 		"gpio.3", NULL),
-	OF_DEV_AUXDATA("stericsson,nmk-pinctrl-stn8815", 0,
+	OF_DEV_AUXDATA("stericsson,stn8815-pinctrl", 0,
 		"pinctrl-stn8815", NULL),
 	OF_DEV_AUXDATA("arm,primecell", NOMADIK_UART0_BASE,
 		"uart0", NULL),

Signature · 1 line

1.7.10.4

Linus Walleij

2013-05-28 14:25 UTC #5 lore raw

Re: [PATCH 3/7] ARM: ux500: Standardise Pinctrl compatible string for Nomadik based platforms

Quoted 10 lines · Lee Jones

Signed-off-by Lee Jones <[email protected]>
---
 arch/arm/mach-nomadik/cpu-8815.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-nomadik/cpu-8815.c +0 -0
index 59f6ff5..316fe82 100644

arch/arm/mach-nomadik/cpu-8815.c static struct of_dev_auxdata cpu8815_auxdata_lookup[] __initdata = { · line 294

Quoted 8 lines

arch/arm/mach-nomadik/cpu-8815.c +1 -1

@@ -288,7 +288,7 @@ static struct of_dev_auxdata cpu8815_auxdata_lookup[] __initdata = {
                "gpio.2", NULL),
        OF_DEV_AUXDATA("st,nomadik-gpio", NOMADIK_GPIO3_BASE,
                "gpio.3", NULL),
-       OF_DEV_AUXDATA("stericsson,nmk-pinctrl-stn8815", 0,
+       OF_DEV_AUXDATA("stericsson,stn8815-pinctrl", 0,
                "pinctrl-stn8815", NULL),
        OF_DEV_AUXDATA("arm,primecell", NOMADIK_UART0_BASE,
                "uart0", NULL),

I've dropped this platform data in the HEAD (now also in ARM SoC) after moving the pinctrl configuration to the DTS, so this no longer applies.

Yours,
Linus Walleij

Lee Jones

author

2013-05-22 14:22 UTC #6 lore raw

PATCH 4/7 ARM: ux500: Standardise Pinctrl compatible string for DBx5x based platforms

In reply to Lee Jones

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

---
 arch/arm/mach-ux500/cpu-db8500.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/mach-ux500/cpu-db8500.c +1 -1

index 8305bad..27c9382 100644
@@ -249,7 +249,7 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
 	OF_DEV_AUXDATA("stericsson,ux500-cryp", 0xa03cb000, "cryp1", NULL),
 	OF_DEV_AUXDATA("stericsson,ux500-hash", 0xa03c2000, "hash1", NULL),
 	/* Requires device name bindings. */
-	OF_DEV_AUXDATA("stericsson,nmk-pinctrl", U8500_PRCMU_BASE,
+	OF_DEV_AUXDATA("stericsson,db8500-pinctrl", U8500_PRCMU_BASE,
 		"pinctrl-db8500", NULL),
 	/* Requires clock name and DMA bindings. */
 	OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80123000,

Signature · 1 line

1.7.10.4

Lee Jones

author

2013-05-22 14:22 UTC #7 lore raw

PATCH 5/7 pinctrl/nomadik: Standardise Pinctrl compat string for Nomadik based platforms

In reply to Lee Jones

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

---
 drivers/pinctrl/pinctrl-nomadik.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/pinctrl/pinctrl-nomadik.c +1 -1

index 3428175..7712d93 100644
@@ -2104,7 +2104,7 @@ static struct pinctrl_desc nmk_pinctrl_desc = {
 
 static const struct of_device_id nmk_pinctrl_match[] = {
 	{
-		.compatible = "stericsson,nmk-pinctrl-stn8815",
+		.compatible = "stericsson,stn8815-pinctrl",
 		.data = (void *)PINCTRL_NMK_STN8815,
 	},
 	{

Signature · 1 line

1.7.10.4

Linus Walleij

2013-05-28 14:27 UTC #8 lore raw

Re: [PATCH 5/7] pinctrl/nomadik: Standardise Pinctrl compat string for Nomadik based platforms

Quoted 1 line · Lee Jones

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

Patch applied to my nomadik-dt branch.

Yours,
Linus Walleij

Lee Jones

author

2013-05-22 14:23 UTC #9 lore raw

PATCH 6/7 pinctrl/nomadik: Standardise Pinctrl compat string for DBx5x based platforms

In reply to Lee Jones

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

---
 drivers/pinctrl/pinctrl-nomadik.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/pinctrl/pinctrl-nomadik.c +2 -2

index 7712d93..8a4f9c5 100644
@@ -2108,11 +2108,11 @@ static const struct of_device_id nmk_pinctrl_match[] = {
 		.data = (void *)PINCTRL_NMK_STN8815,
 	},
 	{
-		.compatible = "stericsson,nmk-pinctrl",
+		.compatible = "stericsson,db8500-pinctrl",
 		.data = (void *)PINCTRL_NMK_DB8500,
 	},
 	{
-		.compatible = "stericsson,nmk-pinctrl-db8540",
+		.compatible = "stericsson,db8540-pinctrl",
 		.data = (void *)PINCTRL_NMK_DB8540,
 	},
 	{},

Signature · 1 line

1.7.10.4

Lee Jones

author

2013-05-22 14:23 UTC #10 lore raw

PATCH 7/7 Documentation: Update binding for Nomadik and DBx5x based platforms

In reply to Lee Jones

Change compatible string to something more standard.

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

---
 Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt +3 -3

index 9a2f3f4..c3d8a89 100644
@@ -1,8 +1,8 @@
 ST Ericsson Nomadik pinmux controller
 
 Required properties:
-- compatible: "stericsson,nmk-pinctrl", "stericsson,nmk-pinctrl-db8540",
-              "stericsson,nmk-pinctrl-stn8815"
+- compatible: "stericsson,db8500-pinctrl", "stericsson,db8540-pinctrl",
+              "stericsson,stn8815-pinctrl"
 - reg: Should contain the register physical address and length of the PRCMU.
 
 Please refer to pinctrl-bindings.txt in this directory for details of the

@@ -68,7 +68,7 @@ Optional subnode-properties:
 Example board file extract:
 
 	pinctrl at 80157000 {
-		compatible = "stericsson,nmk-pinctrl";
+		compatible = "stericsson,u8500-pinctrl";
 		reg = <0x80157000 0x2000>;
 
 		pinctrl-names = "default";

Signature · 1 line

1.7.10.4

Linus Walleij

2013-05-27 10:41 UTC #11 lore raw

Re: [PATCH 7/7] Documentation: Update binding for Nomadik and DBx5x based platforms

Quoted 12 lines · Lee Jones

Change compatible string to something more standard.
Signed-off-by Lee Jones <[email protected]>
---
 Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt +0 -0
index 9a2f3f4..c3d8a89 100644

Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt line 5

Quoted 7 lines

Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt +2 -2

@@ -1,8 +1,8 @@
 ST Ericsson Nomadik pinmux controller
 
 Required properties:
-- compatible: "stericsson,nmk-pinctrl", "stericsson,nmk-pinctrl-db8540",
-              "stericsson,nmk-pinctrl-stn8815"
+- compatible: "stericsson,db8500-pinctrl", "stericsson,db8540-pinctrl",
+              "stericsson,stn8815-pinctrl"

OK...

Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt Optional subnode-properties: · line 71

Quoted 3 lines

Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt +1 -1

        pinctrl at 80157000 {
-               compatible = "stericsson,nmk-pinctrl";
+               compatible = "stericsson,u8500-pinctrl";

This does not look like a supported compatible string?

Yours,
Linus Walleij

Lee Jones

author

2013-05-28 09:38 UTC #12 lore raw

Re: [PATCH 7/7] Documentation: Update binding for Nomadik and DBx5x based platforms

Quoted 6 lines

Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt line 5
Quoted 5 lines
Required properties:
-- compatible: "stericsson,nmk-pinctrl", "stericsson,nmk-pinctrl-db8540",
Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt +2 -1
-              "stericsson,nmk-pinctrl-stn8815"
+- compatible: "stericsson,db8500-pinctrl", "stericsson,db8540-pinctrl",
+              "stericsson,stn8815-pinctrl"

Quoted 7 lines

OK...
Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt Optional subnode-properties: · line 71
Quoted 3 lines
        pinctrl at 80157000 {
Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt +1 -1
-               compatible = "stericsson,nmk-pinctrl";
+               compatible = "stericsson,u8500-pinctrl";
This does not look like a supported compatible string?

Do you still think this, or did you change you mind?

If so, what makes you think it? How does it differ from:

compatible = "arm,cortex-a9-twd-timer";
compatible = "arm,rtc-pl031";
compatible = "stericsson,db8500-gpio",
compatible = "stericsson,db8500-musb",
compatible = "stericsson,db8500-dma40",
compatible = "stericsson,db8500-prcmu";
compatible = "stericsson,db8500-prcmu-timer-4";
compatible = "stericsson,db8500-thermal";
compatible = "stericsson,db8500-prcmu-regulator";

Signature · 4 lines

Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Linus Walleij

2013-05-29 18:41 UTC #13 lore raw

Re: [PATCH 7/7] Documentation: Update binding for Nomadik and DBx5x based platforms

Quoted 8 lines · Lee Jones

Quoted 8 lines
Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt line 5
Quoted 5 lines
Required properties:
-- compatible: "stericsson,nmk-pinctrl", "stericsson,nmk-pinctrl-db8540",
Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt +2 -1
-              "stericsson,nmk-pinctrl-stn8815"
+- compatible: "stericsson,db8500-pinctrl", "stericsson,db8540-pinctrl",
+              "stericsson,stn8815-pinctrl"
OK...

Quoted 7 lines

Quoted 5 lines
Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt Optional subnode-properties: · line 71
Quoted 3 lines
        pinctrl at 80157000 {
Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt +1 -1
-               compatible = "stericsson,nmk-pinctrl";
+               compatible = "stericsson,u8500-pinctrl";
This does not look like a supported compatible string?
Do you still think this, or did you change you mind?

Que? It is not among the listed compatible strings?

Quoted 11 lines

If so, what makes you think it? How does it differ from:
compatible = "arm,cortex-a9-twd-timer";
compatible = "arm,rtc-pl031";
compatible = "stericsson,db8500-gpio",
compatible = "stericsson,db8500-musb",
compatible = "stericsson,db8500-dma40",
compatible = "stericsson,db8500-prcmu";
compatible = "stericsson,db8500-prcmu-timer-4";
compatible = "stericsson,db8500-thermal";
compatible = "stericsson,db8500-prcmu-regulator";

It says u8500-pinctrl, not db8500-pinctrl.

Could it be that you're not actually seeing your own typo?

Yours,
Linus Walleij

Lee Jones

author

2013-05-29 19:01 UTC #14 lore raw

Re: [PATCH 7/7] Documentation: Update binding for Nomadik and DBx5x based platforms

Quoted 31 lines · Linus Walleij

Quoted 8 lines · Lee Jones
Quoted 8 lines
Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt line 5
Quoted 5 lines
Required properties:
-- compatible: "stericsson,nmk-pinctrl", "stericsson,nmk-pinctrl-db8540",
Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt +2 -1
-              "stericsson,nmk-pinctrl-stn8815"
+- compatible: "stericsson,db8500-pinctrl", "stericsson,db8540-pinctrl",
+              "stericsson,stn8815-pinctrl"
OK...
Quoted 7 lines
Quoted 5 lines
Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt Optional subnode-properties: · line 71
Quoted 3 lines
        pinctrl at 80157000 {
Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt +1 -1
-               compatible = "stericsson,nmk-pinctrl";
+               compatible = "stericsson,u8500-pinctrl";
This does not look like a supported compatible string?
Do you still think this, or did you change you mind?
Que? It is not among the listed compatible strings?
Quoted 11 lines
If so, what makes you think it? How does it differ from:
compatible = "arm,cortex-a9-twd-timer";
compatible = "arm,rtc-pl031";
compatible = "stericsson,db8500-gpio",
compatible = "stericsson,db8500-musb",
compatible = "stericsson,db8500-dma40",
compatible = "stericsson,db8500-prcmu";
compatible = "stericsson,db8500-prcmu-timer-4";
compatible = "stericsson,db8500-thermal";
compatible = "stericsson,db8500-prcmu-regulator";

Quoted 3 lines

It says u8500-pinctrl, not db8500-pinctrl.
Could it be that you're not actually seeing your own typo?

Yes, that's exactly what happened.

I thought you were mentioning the way it was laid out.

I'll fixup.

Signature · 4 lines

Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Lee Jones

author

2013-06-10 10:23 UTC #15 lore raw

PATCH v2 7/7 Documentation: Update binding for Nomadik and DBx5x based platforms

In reply to Lee Jones

Change compatible string to something more standard.

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

Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt +3 -3

index 9a2f3f4..6b33b9f 100644
@@ -1,8 +1,8 @@
 ST Ericsson Nomadik pinmux controller
 
 Required properties:
-- compatible: "stericsson,nmk-pinctrl", "stericsson,nmk-pinctrl-db8540",
-              "stericsson,nmk-pinctrl-stn8815"
+- compatible: "stericsson,db8500-pinctrl", "stericsson,db8540-pinctrl",
+              "stericsson,stn8815-pinctrl"
 - reg: Should contain the register physical address and length of the PRCMU.
 
 Please refer to pinctrl-bindings.txt in this directory for details of the

@@ -68,7 +68,7 @@ Optional subnode-properties:
 Example board file extract:
 
 	pinctrl at 80157000 {
-		compatible = "stericsson,nmk-pinctrl";
+		compatible = "stericsson,db8500-pinctrl";
 		reg = <0x80157000 0x2000>;
 
 		pinctrl-names = "default";

Linus Walleij

Applied

2013-06-11 08:43 UTC #16 lore raw

Re: [PATCH 7/7 v2] Documentation: Update binding for Nomadik and DBx5x based platforms

Quoted 3 lines · Lee Jones

Change compatible string to something more standard.
Signed-off-by Lee Jones <[email protected]>

Thanks, applied to ux500-devicetree.

Yours,
Linus Walleij

Linus Walleij

2013-05-27 10:43 UTC #17 lore raw

In reply to Lee Jones

Quoted 9 lines · Lee Jones

Our naming convention started off sensibly, but with the addition of more supported platforms it's slipped a little. Most compatible strings standardise themselves with "<vendor>,<device_name>-<device_type>", which we had initially with "stericsson,nmk-pinctrl", but with more devices to support we now have a tail, so we are using "<vendor>,<driver_name>-<device_type>-<device_name>", which is unsuitable.
This patch-set ensures the standard convention is used again.

I buy this. I have applied patches 1, 4 and 6 to the ux500-devicetree branch. I will apply the remaining patches to the Nomadik branch (which is in another tree).

There might be some trivial conflict in drivers/pinctrl/pinctrl-nomadik.c as a result of this being split in two trees but it'll be manageable I think (will be resolved in ARM SoC).

Yours,
Linus Walleij