* [PATCH] ARM: ux500: correct typo in pinctrl Device Tree node
@ 2013-01-30 16:25 Linus Walleij
2013-01-30 16:46 ` Stephen Warren
0 siblings, 1 reply; 6+ messages in thread
From: Linus Walleij @ 2013-01-30 16:25 UTC (permalink / raw)
To: linux-arm-kernel
From: Lee Jones <lee.jones@linaro.org>
The preference is to use '-' instead of '_' in compatible strings.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@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 96f518b..69140ba 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>;
};
--
1.7.11.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] ARM: ux500: correct typo in pinctrl Device Tree node
2013-01-30 16:25 [PATCH] ARM: ux500: correct typo in pinctrl Device Tree node Linus Walleij
@ 2013-01-30 16:46 ` Stephen Warren
2013-01-30 16:58 ` Lee Jones
2013-01-30 17:07 ` [PATCH 1/1] pinctrl: nomadik: Rename Device Tree compatible string Lee Jones
0 siblings, 2 replies; 6+ messages in thread
From: Stephen Warren @ 2013-01-30 16:46 UTC (permalink / raw)
To: linux-arm-kernel
On 01/30/2013 09:25 AM, Linus Walleij wrote:
> The preference is to use '-' instead of '_' in compatible strings.
> diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi
> pinctrl {
> - compatible = "stericsson,nmk_pinctrl";
> + compatible = "stericsson,nmk-pinctrl";
Is there a driver-side patch which this depends on too?
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: ux500: correct typo in pinctrl Device Tree node
2013-01-30 16:46 ` Stephen Warren
@ 2013-01-30 16:58 ` Lee Jones
2013-01-30 17:07 ` [PATCH 1/1] pinctrl: nomadik: Rename Device Tree compatible string Lee Jones
1 sibling, 0 replies; 6+ messages in thread
From: Lee Jones @ 2013-01-30 16:58 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, 30 Jan 2013, Stephen Warren wrote:
> On 01/30/2013 09:25 AM, Linus Walleij wrote:
> > The preference is to use '-' instead of '_' in compatible strings.
>
> > diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi
>
> > 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.
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/1] pinctrl: nomadik: Rename Device Tree compatible string
2013-01-30 16:46 ` Stephen Warren
2013-01-30 16:58 ` Lee Jones
@ 2013-01-30 17:07 ` Lee Jones
2013-01-30 17:27 ` Stephen Warren
2013-01-30 18:08 ` Linus Walleij
1 sibling, 2 replies; 6+ messages in thread
From: Lee Jones @ 2013-01-30 17:07 UTC (permalink / raw)
To: linux-arm-kernel
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(-)
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,
},
{},
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 1/1] pinctrl: nomadik: Rename Device Tree compatible string
2013-01-30 17:07 ` [PATCH 1/1] pinctrl: nomadik: Rename Device Tree compatible string Lee Jones
@ 2013-01-30 17:27 ` Stephen Warren
2013-01-30 18:08 ` Linus Walleij
1 sibling, 0 replies; 6+ messages in thread
From: Stephen Warren @ 2013-01-30 17:27 UTC (permalink / raw)
To: linux-arm-kernel
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?
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/1] pinctrl: nomadik: Rename Device Tree compatible string
2013-01-30 17:07 ` [PATCH 1/1] pinctrl: nomadik: Rename Device Tree compatible string Lee Jones
2013-01-30 17:27 ` Stephen Warren
@ 2013-01-30 18:08 ` Linus Walleij
1 sibling, 0 replies; 6+ messages in thread
From: Linus Walleij @ 2013-01-30 18:08 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-01-30 18:08 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-30 16:25 [PATCH] ARM: ux500: correct typo in pinctrl Device Tree node Linus Walleij
2013-01-30 16:46 ` Stephen Warren
2013-01-30 16:58 ` Lee Jones
2013-01-30 17:07 ` [PATCH 1/1] pinctrl: nomadik: Rename Device Tree compatible string Lee Jones
2013-01-30 17:27 ` Stephen Warren
2013-01-30 18:08 ` Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).