* [PATCH] ARM: Dove: move CuBox led pinctrl to gpio-leds node
@ 2012-12-27 22:21 Sebastian Hesselbarth
2013-01-12 21:42 ` Jason Cooper
2013-01-12 22:37 ` Jason Cooper
0 siblings, 2 replies; 5+ messages in thread
From: Sebastian Hesselbarth @ 2012-12-27 22:21 UTC (permalink / raw)
To: linux-arm-kernel
gpio-leds has support for pinctrl allocation, make use of it.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
---
arch/arm/boot/dts/dove-cubox.dts | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts
index cdee96f..bed5b62 100644
--- a/arch/arm/boot/dts/dove-cubox.dts
+++ b/arch/arm/boot/dts/dove-cubox.dts
@@ -17,6 +17,9 @@
leds {
compatible = "gpio-leds";
+ pinctrl-0 = <&pmx_gpio_18>;
+ pinctrl-names = "default";
+
power {
label = "Power";
gpios = <&gpio0 18 1>;
@@ -47,7 +50,7 @@
};
&pinctrl {
- pinctrl-0 = <&pmx_gpio_12 &pmx_gpio_18>;
+ pinctrl-0 = <&pmx_gpio_12>;
pinctrl-names = "default";
pmx_gpio_12: pmx-gpio-12 {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH] ARM: Dove: move CuBox led pinctrl to gpio-leds node
2012-12-27 22:21 [PATCH] ARM: Dove: move CuBox led pinctrl to gpio-leds node Sebastian Hesselbarth
@ 2013-01-12 21:42 ` Jason Cooper
2013-01-12 21:51 ` Sebastian Hesselbarth
2013-01-12 22:37 ` Jason Cooper
1 sibling, 1 reply; 5+ messages in thread
From: Jason Cooper @ 2013-01-12 21:42 UTC (permalink / raw)
To: linux-arm-kernel
Sebastian,
On Thu, Dec 27, 2012 at 11:21:10PM +0100, Sebastian Hesselbarth wrote:
> gpio-leds has support for pinctrl allocation, make use of it.
>
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> ---
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> ---
> arch/arm/boot/dts/dove-cubox.dts | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts
> index cdee96f..bed5b62 100644
> --- a/arch/arm/boot/dts/dove-cubox.dts
> +++ b/arch/arm/boot/dts/dove-cubox.dts
> @@ -17,6 +17,9 @@
>
> leds {
> compatible = "gpio-leds";
> + pinctrl-0 = <&pmx_gpio_18>;
> + pinctrl-names = "default";
> +
> power {
> label = "Power";
> gpios = <&gpio0 18 1>;
> @@ -47,7 +50,7 @@
> };
>
> &pinctrl {
> - pinctrl-0 = <&pmx_gpio_12 &pmx_gpio_18>;
> + pinctrl-0 = <&pmx_gpio_12>;
> pinctrl-names = "default";
>
> pmx_gpio_12: pmx-gpio-12 {
> --
> 1.7.10.4
I'm getting a merge conflict wit hthe above:
&pinctrl {
<<<<<<< HEAD
pinctrl-0 = <&pmx_gpio_18>;
=======
pinctrl-0 = <&pmx_gpio_12>;
>>>>>>> ARM: Dove: move CuBox led pinctrl to gpio-leds node
pinctrl-names = "default";
pmx_gpio_18: pmx-gpio-18 {
marvell,pins = "mpp18";
marvell,function = "gpio";
};
};
Am I missing something?
thx,
Jason.
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH] ARM: Dove: move CuBox led pinctrl to gpio-leds node
2013-01-12 21:42 ` Jason Cooper
@ 2013-01-12 21:51 ` Sebastian Hesselbarth
2013-01-12 22:30 ` Jason Cooper
0 siblings, 1 reply; 5+ messages in thread
From: Sebastian Hesselbarth @ 2013-01-12 21:51 UTC (permalink / raw)
To: linux-arm-kernel
On 01/12/2013 10:42 PM, Jason Cooper wrote:
> On Thu, Dec 27, 2012 at 11:21:10PM +0100, Sebastian Hesselbarth wrote:
>> gpio-leds has support for pinctrl allocation, make use of it.
>>
>> Signed-off-by: Sebastian Hesselbarth<sebastian.hesselbarth@gmail.com>
>> ...
>> &pinctrl {
>> - pinctrl-0 =<&pmx_gpio_12&pmx_gpio_18>;
>> + pinctrl-0 =<&pmx_gpio_12>;
>> pinctrl-names = "default";
>>
>> pmx_gpio_12: pmx-gpio-12 {
>> --
>> 1.7.10.4
>
> I'm getting a merge conflict wit hthe above:
>
> &pinctrl {
> <<<<<<< HEAD
> pinctrl-0 =<&pmx_gpio_18>;
> =======
> pinctrl-0 =<&pmx_gpio_12>;
>>>>>>>> ARM: Dove: move CuBox led pinctrl to gpio-leds node
> pinctrl-names = "default";
>
> pmx_gpio_18: pmx-gpio-18 {
> marvell,pins = "mpp18";
> marvell,function = "gpio";
> };
> };
>
> Am I missing something?
Jason,
it depends on "ARM: Dove: move CuBox led pinctrl to gpio-leds node"
that you applied to mvebu/fixes two days ago.
You can postpone the patch another rc if that helps as it just moves
led pinctrl but still works when on pinctrl hog.
Sebastian
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH] ARM: Dove: move CuBox led pinctrl to gpio-leds node
2013-01-12 21:51 ` Sebastian Hesselbarth
@ 2013-01-12 22:30 ` Jason Cooper
0 siblings, 0 replies; 5+ messages in thread
From: Jason Cooper @ 2013-01-12 22:30 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Jan 12, 2013 at 10:51:35PM +0100, Sebastian Hesselbarth wrote:
> On 01/12/2013 10:42 PM, Jason Cooper wrote:
> >On Thu, Dec 27, 2012 at 11:21:10PM +0100, Sebastian Hesselbarth wrote:
> >>gpio-leds has support for pinctrl allocation, make use of it.
> >>
> >>Signed-off-by: Sebastian Hesselbarth<sebastian.hesselbarth@gmail.com>
> >> ...
> >> &pinctrl {
> >>- pinctrl-0 =<&pmx_gpio_12&pmx_gpio_18>;
> >>+ pinctrl-0 =<&pmx_gpio_12>;
> >> pinctrl-names = "default";
> >>
> >> pmx_gpio_12: pmx-gpio-12 {
> >>--
> >>1.7.10.4
> >
> >I'm getting a merge conflict wit hthe above:
> >
> >&pinctrl {
> ><<<<<<< HEAD
> > pinctrl-0 =<&pmx_gpio_18>;
> >=======
> > pinctrl-0 =<&pmx_gpio_12>;
> >>>>>>>>ARM: Dove: move CuBox led pinctrl to gpio-leds node
> > pinctrl-names = "default";
> >
> > pmx_gpio_18: pmx-gpio-18 {
> > marvell,pins = "mpp18";
> > marvell,function = "gpio";
> > };
> >};
> >
> >Am I missing something?
>
> Jason,
>
> it depends on "ARM: Dove: move CuBox led pinctrl to gpio-leds node"
> that you applied to mvebu/fixes two days ago.
Ahhh, ok, I'll include it in this pull.
thx,
Jason.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] ARM: Dove: move CuBox led pinctrl to gpio-leds node
2012-12-27 22:21 [PATCH] ARM: Dove: move CuBox led pinctrl to gpio-leds node Sebastian Hesselbarth
2013-01-12 21:42 ` Jason Cooper
@ 2013-01-12 22:37 ` Jason Cooper
1 sibling, 0 replies; 5+ messages in thread
From: Jason Cooper @ 2013-01-12 22:37 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Dec 27, 2012 at 11:21:10PM +0100, Sebastian Hesselbarth wrote:
> gpio-leds has support for pinctrl allocation, make use of it.
>
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> ---
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> ---
> arch/arm/boot/dts/dove-cubox.dts | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
Applied to mvebu/dt
thx,
Jason.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-01-12 22:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-27 22:21 [PATCH] ARM: Dove: move CuBox led pinctrl to gpio-leds node Sebastian Hesselbarth
2013-01-12 21:42 ` Jason Cooper
2013-01-12 21:51 ` Sebastian Hesselbarth
2013-01-12 22:30 ` Jason Cooper
2013-01-12 22:37 ` Jason Cooper
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).