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.hesselba...@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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
