2012/9/28 Barry Song [off-list ref]:

Hi linus,
thanks very much!

2012/9/28 Linus Walleij [off-list ref]:

quoted

On Thu, Sep 27, 2012 at 11:56 AM, Barry Song [off-list ref] wrote:

quoted

From: Barry Song <redacted>

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 <redacted>

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:

http://git.kernel.org/?p=linux/kernel/git/arm/arm-soc.git;a=commitdiff;h=056876f6c73406c06d530d16d020177f5ec4a0bd
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" },
        {}
};
to
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.

Hi Linus,
this one can be applied now. would you apply? as i have tried, now it
can be applied directly againest 3.7-rc3:

barry at barry-VirtualBox:~/development/linux-2.6$ git log
commit 5e0ca7b04ab1a5e4ca778045fdc6b97c1bd2ea3f
Author: Barry Song [off-list ref]
Date:   Thu Sep 27 17:56:30 2012 +0800

    pinctrl: sirf: enable the driver support new SiRFmarco SoC

    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 [off-list ref]

commit 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64
Author: Linus Torvalds [off-list ref]
Date:   Sun Oct 28 12:24:48 2012 -0700

    Linux 3.7-rc3

commit 5a5210c6adaddbed823162eb76dfdbac72bdb802
Merge: 8e99165 8bc5e4e
Author: Linus Torvalds [off-list ref]
Date:   Sun Oct 28 11:14:52 2012 -0700

quoted

Yours,
Linus Walleij

-barry