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

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.