[PATCH] ARM: Dove: move CuBox led pinctrl to gpio-leds node

Subsystems: the rest

STALE4957d

5 messages, 2 authors, 2013-01-12 · open the first message on its own page

[PATCH] ARM: Dove: move CuBox led pinctrl to gpio-leds node

From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Date: 2012-12-27 22:21:34 

gpio-leds has support for pinctrl allocation, make use of it.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: Russell King <redacted>
Cc: Jason Cooper <redacted>
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

Re: [PATCH] ARM: Dove: move CuBox led pinctrl to gpio-leds node

From: Jason Cooper <hidden>
Date: 2013-01-12 21:43:04 

Sebastian,

On Thu, Dec 27, 2012 at 11:21:10PM +0100, Sebastian Hesselbarth wrote:
quoted hunk
gpio-leds has support for pinctrl allocation, make use of it.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: Russell King <redacted>
Cc: Jason Cooper <redacted>
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>;
quoted
quoted
quoted
quoted
quoted
quoted
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.

Re: [PATCH] ARM: Dove: move CuBox led pinctrl to gpio-leds node

From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Date: 2013-01-12 21:51:41 

On 01/12/2013 10:42 PM, Jason Cooper wrote:
On Thu, Dec 27, 2012 at 11:21:10PM +0100, Sebastian Hesselbarth wrote:
quoted
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>;
quoted
quoted
quoted
quoted
quoted
quoted
quoted
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

Re: [PATCH] ARM: Dove: move CuBox led pinctrl to gpio-leds node

From: Jason Cooper <hidden>
Date: 2013-01-12 22:30:56 

On Sat, Jan 12, 2013 at 10:51:35PM +0100, Sebastian Hesselbarth wrote:
On 01/12/2013 10:42 PM, Jason Cooper wrote:
quoted
On Thu, Dec 27, 2012 at 11:21:10PM +0100, Sebastian Hesselbarth wrote:
quoted
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>;
quoted
quoted
quoted
quoted
quoted
quoted
quoted
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.

Re: [PATCH] ARM: Dove: move CuBox led pinctrl to gpio-leds node

From: Jason Cooper <hidden>
Date: 2013-01-12 22:37:10 

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 <redacted>
Cc: Jason Cooper <redacted>
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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help