[PATCH] pinctrl:sirf:re-arch and add support for new SiRFatlas6 SoC

[Linus Walleij]

On Sun, Apr 7, 2013 at 5:03 AM, Barry Song <21cnbao at gmail.com> wrote:
> 2013/4/3 Linus Walleij <linus.walleij at linaro.org>:
>> On Thu, Mar 28, 2013 at 7:27 AM, Barry Song <21cnbao at gmail.com> wrote:
>>> 2013/3/28, Linus Walleij <linus.walleij at linaro.org>:
>>
>>>>> Signed-off-by: Barry Song <Baohua.Song at csr.com>
>>>>
>>>> This is OK but can you please:
>>>
>>> ok. one issue is recently Arnd has given another changes in
>>> pinctrl-sirf in arm-soc multiple platform branch:
>>> https://git.kernel.org/cgit/linux/kernel/git/arm/arm-soc.git/commit/?h=prima2/multiplatform&id=67d71344fd09223820eb9de39b597ec29f035e89
>>>
>>> it makes us easily to get merging conflict. what is your suggestion
>>> about taking all these changes in 3.10?
>>
>> Please send this to where the rest of the patches are with my ACK
>> (I guess the ARM SoC tree?)
>
> unfortunately, this is not in arm soc:
> Wei Yongjun <yongjun_wei at trendmicro.com.cn>
> pinctrl: sirf: using for_each_set_bit to simplify the code
>
> https://git.kernel.org/cgit/linux/kernel/git/linusw/linux-pinctrl.git/commit/?h=for-next&id=3dcbd6f5789839c7fea8841088ed3a28688f81ed
>
> i think there will still be some merge conflict. so to make people
> easy, i might wait for 3.11 and resend the patch with your ack, then
> you apply it on pinctrl tree.

OK let's do it like that.

Yours,
Linus Walleij