diff mbox

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

Message ID 20130130170750.GA5217@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Lee Jones Jan. 30, 2013, 5:07 p.m. UTC 
The preference is to use '-' instead of '_' in compatible strings.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
---
 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(-)

Comments

Stephen Warren Jan. 30, 2013, 5:27 p.m. UTC | #1 
On 01/30/2013 10:07 AM, Lee Jones wrote:
> 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?
Linus Walleij Jan. 30, 2013, 6:08 p.m. UTC | #2 
On Wed, Jan 30, 2013 at 6:07 PM, Lee Jones <lee.jones@linaro.org> wrote:

> The preference is to use '-' instead of '_' in compatible strings.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> Acked-by: Linus Walleij <linus.walleij@linaro.org>

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 <gabriel.fernandez@stericsson.com>
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 <gabriel.fernandez@stericsson.com>
    Reviewed-by: Stephen Warren <swarren@nvidia.com>
    Reviewed-by: Philippe Langlais <philippe.langlais@stericsson.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

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
diff mbox

Patch

diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi
index 3381ba6..b6256f3 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,nmk-pinctrl";
 			prcm = <&prcmu>;
 		};
 
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 5b286e0..b80ad96 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -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,
diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c
index 4954302..2081931 100644
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@ -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,
 	},
 	{},