[PATCH 0/7] ARM: ux500: Change naming convention for pinctrl

[PATCH 0/7] ARM: ux500: Change naming convention for pinctrl

[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.

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

[Lee Jones]

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/dbx5x0.dtsi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi
index 6c25fbe..d0835ca 100644
--- a/arch/arm/boot/dts/dbx5x0.dtsi
+++ b/arch/arm/boot/dts/dbx5x0.dtsi
@@ -171,7 +171,7 @@
 		};
 
 		pinctrl {
-			compatible = "stericsson,nmk-pinctrl";
+			compatible = "stericsson,db8500-pinctrl";
 			prcm = <&prcmu>;
 		};
 
-- 
1.7.10.4

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

[Lee Jones]

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/ste-nomadik-stn8815.dtsi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
index 4a4aab3..a6c2112 100644
--- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
+++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
@@ -84,7 +84,7 @@
 	};
 
 	pinctrl {
-		compatible = "stericsson,nmk-pinctrl-stn8815";
+		compatible = "stericsson,stn8815-pinctrl";
 	};
 
 	/* A NAND flash of 128 MiB */
-- 
1.7.10.4

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

[Linus Walleij]

On Wed, May 22, 2013 at 4:22 PM, Lee Jones <lee.jones@linaro.org> wrote:

> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Patch applied to my nomadik-dt branch.

Yours,
Linus Walleij

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

[Lee Jones]

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/mach-nomadik/cpu-8815.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c
index 59f6ff5..316fe82 100644
--- a/arch/arm/mach-nomadik/cpu-8815.c
+++ b/arch/arm/mach-nomadik/cpu-8815.c
@@ -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),
-- 
1.7.10.4

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

[Linus Walleij]

On Wed, May 22, 2013 at 4:22 PM, Lee Jones <lee.jones@linaro.org> wrote:

> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
>  arch/arm/mach-nomadik/cpu-8815.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c
> index 59f6ff5..316fe82 100644
> --- a/arch/arm/mach-nomadik/cpu-8815.c
> +++ b/arch/arm/mach-nomadik/cpu-8815.c
> @@ -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

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

[Lee Jones]

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/mach-ux500/cpu-db8500.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 8305bad..27c9382 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -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,
-- 
1.7.10.4

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

[Lee Jones]

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/pinctrl/pinctrl-nomadik.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c
index 3428175..7712d93 100644
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@ -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,
 	},
 	{
-- 
1.7.10.4

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

[Linus Walleij]

On Wed, May 22, 2013 at 4:22 PM, Lee Jones <lee.jones@linaro.org> wrote:

> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Patch applied to my nomadik-dt branch.

Yours,
Linus Walleij

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

[Lee Jones]

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/pinctrl/pinctrl-nomadik.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c
index 7712d93..8a4f9c5 100644
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@ -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,
 	},
 	{},
-- 
1.7.10.4

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

[Lee Jones]

Change compatible string to something more standard.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt b/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
index 9a2f3f4..c3d8a89 100644
--- a/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
+++ b/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
@@ -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";
-- 
1.7.10.4

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

[Linus Walleij]

On Wed, May 22, 2013 at 4:23 PM, Lee Jones <lee.jones@linaro.org> wrote:

> Change compatible string to something more standard.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
>  Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt b/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
> index 9a2f3f4..c3d8a89 100644
> --- a/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
> +++ b/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
> @@ -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...

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

This does not look like a supported compatible string?

Yours,
Linus Walleij

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

[Lee Jones]

> >  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...
> 
> >         pinctrl at 80157000 {
> > -               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";



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

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

[Linus Walleij]

On Tue, May 28, 2013 at 11:38 AM, Lee Jones <lee.jones@linaro.org> wrote:
>> >  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...
>>
>> >         pinctrl at 80157000 {
>> > -               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?

> 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

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

[Lee Jones]

On Wed, 29 May 2013, Linus Walleij wrote:

> On Tue, May 28, 2013 at 11:38 AM, Lee Jones <lee.jones@linaro.org> wrote:
> >> >  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...
> >>
> >> >         pinctrl at 80157000 {
> >> > -               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?
> 
> > 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?

Yes, that's exactly what happened.

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

I'll fixup.

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

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

[Lee Jones]

Change compatible string to something more standard.
   
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt b/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
index 9a2f3f4..6b33b9f 100644
--- a/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
+++ b/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
@@ -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";

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

[Linus Walleij]

On Mon, Jun 10, 2013 at 12:23 PM, Lee Jones <lee.jones@linaro.org> wrote:

> Change compatible string to something more standard.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Thanks, applied to ux500-devicetree.

Yours,
Linus Walleij

[PATCH 0/7] ARM: ux500: Change naming convention for pinctrl

[Linus Walleij]

On Wed, May 22, 2013 at 4:22 PM, Lee Jones <lee.jones@linaro.org> wrote:

> 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