lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <20130112214257.GF13433@titan.lakedaemon.net> Date: Sat, 12 Jan 2013 16:42:57 -0500 From: Jason Cooper <jason@...edaemon.net> To: Sebastian Hesselbarth <sebastian.hesselbarth@...il.com> Cc: Andrew Lunn <andrew@...n.ch>, Russell King <linux@....linux.org.uk>, linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org Subject: Re: [PATCH] ARM: Dove: move CuBox led pinctrl to gpio-leds node 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@...il.com> > --- > Cc: Russell King <linux@....linux.org.uk> > Cc: Jason Cooper <jason@...edaemon.net> > Cc: Andrew Lunn <andrew@...n.ch> > Cc: Sebastian Hesselbarth <sebastian.hesselbarth@...il.com> > Cc: linux-arm-kernel@...ts.infradead.org > Cc: linux-kernel@...r.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. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists