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

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <50F1DAE7.4050508@gmail.com>
Date:	Sat, 12 Jan 2013 22:51:35 +0100
From:	Sebastian Hesselbarth <sebastian.hesselbarth@...il.com>
To:	Jason Cooper <jason@...edaemon.net>
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

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@...il.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 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/