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

Barry Song 21cnbao at gmail.com
Thu Mar 28 02:27:13 EDT 2013

2013/3/28, Linus Walleij <linus.walleij at linaro.org>:
> On Mon, Mar 18, 2013 at 10:13 AM, Barry Song <Barry.Song at csr.com> wrote:
>> atlas6 is a SoC very similar with primaII, the register layput of
>> pinctrl is same, but the pads, groups and functions of atlas6 have
>> different layout with prima2, this patch
>> 1. pull the definition of pads, groups and functions out of the
>> pinctrl-sirf driver,and put them into soc-specific files
>> 2. add pads, groups and functions tables for atlas6
>> 3. let pads, groups and functions tables become the config data of
>>    the related dt compatible node, so the pinctrl-sirf can support
>>    all SiRF SoCs with the config data as private data.
>> In this patch,we create a sirf dir, and let
>> the old drivers/pinctrl/pinctrl-sirf.c =
>>         drivers/pinctrl/sirf/pinctrl-prima2.c +
>>         drivers/pinctrl/sirf/pinctrl-sirf.c
>> drivers/pinctrl/sirf/pinctrl-atlas6.c is a newly created file for the
>> pin layout of atlas6.
>> 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:

it makes us easily to get merging conflict. what is your suggestion
about taking all these changes in 3.10?

> - Base the patch on the "devel" branch in my pinctrl tree?
> - Try to use the -M flag when formatting the patch so it
>   gets more readable?

yes. i did have already done that in this patch as you see:
 rename drivers/pinctrl/{pinctrl-sirf.c => sirf/pinctrl-prima2.c} (50%)
but git -M has failed to know this:
drivers/pinctrl/{pinctrl-sirf.c => sirf/pinctrl-sirf}

it seems git -M can't support the case a file are forked to 2 files
and let the 2 files follow the old file. it only lets one follow the
old file.

> Yours,
> Linus Walleij


More information about the linux-arm-kernel mailing list