[PATCH 6/6] pinctrl: sirf: enable the driver support new SiRFmarco SoC

Barry Song 21cnbao at gmail.com
Fri Sep 28 10:29:23 EDT 2012

Hi linus,
thanks very much!

2012/9/28 Linus Walleij <linus.walleij at linaro.org>:
> On Thu, Sep 27, 2012 at 11:56 AM, Barry Song <Barry.Song at csr.com> wrote:
>> From: Barry Song <Baohua.Song at csr.com>
>> The driver supports old up SiRFprimaII SoCs, this patch makes it support
>> the new SiRFmarco as well.
>> SiRFmarco, as a SMP SoC, adds new SIRFSOC_GPIO_PAD_EN_CLR registers, to
>> disable GPIO pad, we should write 1 to the corresponding bit in the new
>> CLEAR register instead of writing 0 to SIRFSOC_GPIO_PAD_EN.
>> Signed-off-by: Barry Song <Baohua.Song at csr.com>
> This doesn't apply to my tree, you must have some other changes that
> are not included in the patch set...
> Can you pls try to generate and test the patch against the pinctrl tree?
> I might apply it as per the "new driver" rule if I can convince myself that it
> doesn't destabilize the current driver.

this one actually depends on:

which was applied to arm soc tree.

the only conflict comes from:
 static const struct of_device_id pinmux_ids[] __devinitconst = {
        { .compatible = "sirf,prima2-pinctrl" },
+       { .compatible = "sirf,marco-pinctrl" },

as commit 056876f6c73406c0 renamed the old
static const struct of_device_id pinmux_ids[] __devinitconst = {
        { .compatible = "sirf,prima2-gpio-pinmux" },
static const struct of_device_id pinmux_ids[] __devinitconst = {
        { .compatible = "sirf,sirf,prima2-pinctrl" },

so i think the best way is we hold on this patch for the moment, and
wait for 3.7-rc1.
all other 5 are critical fixes and have no merge conflict with arm-soc
tree as i have tried.

> Yours,
> Linus Walleij


More information about the linux-arm-kernel mailing list