[PATCH 0/5] Assorted patches for pxa-gpio

[PATCH 0/5] Assorted patches for pxa-gpio

[Daniel Mack]

Hi Eric,
Hi Haojian,

here are some patches for gpio-pxa and its bindings. They fix some
flaws I came across while trying to boot a PXA3xx board with v3.10+.


Best regards,
Daniel

Daniel Mack (5):
  gpio: pxa: remove dead code
  gpio: pxa: fix Documentation of interrupt-names property
  gpio: pxa: Documentation: provide example bindings for PXA3xx
  ARM: pxa: fix DT auxdata for pxa3xx-gpio
  ARM: pxa: DTS: override gpio node in pxa3xx.dtsi

 .../devicetree/bindings/gpio/mrvl-gpio.txt         | 22 ++++++++++++++++++----
 arch/arm/boot/dts/pxa3xx.dtsi                      | 11 +++++++++++
 arch/arm/mach-pxa/pxa-dt.c                         |  2 +-
 drivers/gpio/gpio-pxa.c                            | 13 +++----------
 4 files changed, 33 insertions(+), 15 deletions(-)

-- 
1.8.1.4

[PATCH 1/5] gpio: pxa: remove dead code

[Daniel Mack]

Commit f87311743 ("ARM: mmp: add more compatible names in gpio driver")
changed the driver logic to determine the number of available GPIOs from
the compatible string, and hence obsoleted the (undocumented) child
nodes that were previously necessary. However, it left some remainder
which can be safely removed now.

Also, this patch makes pxa_gpio_probe_dt() return the correct value in
case irq_alloc_descs() fails.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>
---
 drivers/gpio/gpio-pxa.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
index df2199d..cc13d1b 100644
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@ -524,8 +524,8 @@ const struct irq_domain_ops pxa_irq_domain_ops = {
 
 static int pxa_gpio_probe_dt(struct platform_device *pdev)
 {
-	int ret, nr_gpios;
-	struct device_node *prev, *next, *np = pdev->dev.of_node;
+	int ret = 0, nr_gpios;
+	struct device_node *np = pdev->dev.of_node;
 	const struct of_device_id *of_id =
 				of_match_device(pxa_gpio_dt_ids, &pdev->dev);
 	const struct pxa_gpio_id *gpio_id;
@@ -537,20 +537,13 @@ static int pxa_gpio_probe_dt(struct platform_device *pdev)
 	gpio_id = of_id->data;
 	gpio_type = gpio_id->type;
 
-	next = of_get_next_child(np, NULL);
-	prev = next;
-	if (!next) {
-		dev_err(&pdev->dev, "Failed to find child gpio node\n");
-		ret = -EINVAL;
-		goto err;
-	}
-	of_node_put(prev);
 	nr_gpios = gpio_id->gpio_nums;
 	pxa_last_gpio = nr_gpios - 1;
 
 	irq_base = irq_alloc_descs(-1, 0, nr_gpios, 0);
 	if (irq_base < 0) {
 		dev_err(&pdev->dev, "Failed to allocate IRQ numbers\n");
+		ret = irq_base;
 		goto err;
 	}
 	domain = irq_domain_add_legacy(np, nr_gpios, irq_base, 0,
-- 
1.8.1.4

[PATCH 2/5] gpio: pxa: fix Documentation of interrupt-names property

[Daniel Mack]

The property name to pass names for interrupt resources is called
"interrupt-names", not "interrupt-name". Fix it to avoid further
confusion.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>
---
 Documentation/devicetree/bindings/gpio/mrvl-gpio.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt b/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt
index 9b3f1d4..6641626 100644
--- a/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt
+++ b/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt
@@ -10,8 +10,9 @@ Required properties:
   There're three gpio interrupts in arch-pxa, and they're gpio0,
   gpio1 and gpio_mux. There're only one gpio interrupt in arch-mmp,
   gpio_mux.
-- interrupt-name : Should be the name of irq resource. Each interrupt
-  binds its interrupt-name.
+- interrupt-names : Should be the names of irq resources. Each interrupt
+  uses its own interrupt name, so there should be as many interrupt names
+  as referenced interrups.
 - interrupt-controller : Identifies the node as an interrupt controller.
 - #interrupt-cells: Specifies the number of cells needed to encode an
   interrupt source.
@@ -24,7 +25,7 @@ Example:
 		compatible = "marvell,mmp-gpio";
 		reg = <0xd4019000 0x1000>;
 		interrupts = <49>;
-		interrupt-name = "gpio_mux";
+		interrupt-names = "gpio_mux";
 		gpio-controller;
 		#gpio-cells = <1>;
 		interrupt-controller;
-- 
1.8.1.4

[PATCH 3/5] gpio: pxa: Documentation: provide example bindings for PXA3xx

[Daniel Mack]

Add another example to describe bindings that work for PXA3xx boards.

Signed-off-by: Daniel Mack <zonque@gmail.com>
---
 Documentation/devicetree/bindings/gpio/mrvl-gpio.txt | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt b/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt
index 6641626..b2afdb2 100644
--- a/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt
+++ b/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt
@@ -19,7 +19,7 @@ Required properties:
 - gpio-controller : Marks the device node as a gpio controller.
 - #gpio-cells : Should be one.  It is the pin number.
 
-Example:
+Example for a MMP platform:
 
 	gpio: gpio at d4019000 {
 		compatible = "marvell,mmp-gpio";
@@ -32,6 +32,19 @@ Example:
 		#interrupt-cells = <1>;
       };
 
+Example for a PXA3xx platform:
+
+	gpio: gpio at 40e00000 {
+		compatible = "intel,pxa3xx-gpio";
+		reg = <0x40e00000 0x10000>;
+		interrupt-names = "gpio0", "gpio1", "gpio_mux";
+		interrupts = <8 9 10>;
+		gpio-controller;
+		#gpio-cells = <0x2>;
+		interrupt-controller;
+		#interrupt-cells = <0x2>;
+	};
+
 * Marvell Orion GPIO Controller
 
 Required properties:
-- 
1.8.1.4

[PATCH 4/5] ARM: pxa: fix DT auxdata for pxa3xx-gpio

[Daniel Mack]

Commit f87311743 ("ARM: mmp: add more compatible names in gpio driver")
changed the DT match string for pxa3xx-gpio, but left the auxdata table
unchanged.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>
---
 arch/arm/mach-pxa/pxa-dt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-pxa/pxa-dt.c b/arch/arm/mach-pxa/pxa-dt.c
index 3835979..f6a2c4b 100644
--- a/arch/arm/mach-pxa/pxa-dt.c
+++ b/arch/arm/mach-pxa/pxa-dt.c
@@ -28,7 +28,7 @@ static const struct of_dev_auxdata pxa3xx_auxdata_lookup[] __initconst = {
 	OF_DEV_AUXDATA("mrvl,pxa-uart",		0x40700000, "pxa2xx-uart.2", NULL),
 	OF_DEV_AUXDATA("mrvl,pxa-uart",		0x41600000, "pxa2xx-uart.3", NULL),
 	OF_DEV_AUXDATA("marvell,pxa-mmc",	0x41100000, "pxa2xx-mci.0", NULL),
-	OF_DEV_AUXDATA("mrvl,pxa-gpio",		0x40e00000, "pxa-gpio", NULL),
+	OF_DEV_AUXDATA("intel,pxa3xx-gpio",	0x40e00000, "pxa3xx-gpio", NULL),
 	OF_DEV_AUXDATA("marvell,pxa-ohci",	0x4c000000, "pxa27x-ohci", NULL),
 	OF_DEV_AUXDATA("mrvl,pxa-i2c",		0x40301680, "pxa2xx-i2c.0", NULL),
 	OF_DEV_AUXDATA("mrvl,pwri2c",		0x40f500c0, "pxa3xx-i2c.1", NULL),
-- 
1.8.1.4

[PATCH 5/5] ARM: pxa: DTS: override gpio node in pxa3xx.dtsi

[Daniel Mack]

The gpio controller node inherited from pxa2xx.dtsi won't work for
pxa3xx SoCs, so let's override it in pxa3xx.dtsi.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>
---
 arch/arm/boot/dts/pxa3xx.dtsi | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index f9d92da..83bb0ef 100644
--- a/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/arch/arm/boot/dts/pxa3xx.dtsi
@@ -28,5 +28,16 @@
 			marvell,intc-priority;
 			marvell,intc-nr-irqs = <56>;
 		};
+
+		gpio: gpio at 40e00000 {
+			compatible = "intel,pxa3xx-gpio";
+			reg = <0x40e00000 0x10000>;
+			interrupt-names = "gpio0", "gpio1", "gpio_mux";
+			interrupts = <8 9 10>;
+			gpio-controller;
+			#gpio-cells = <0x2>;
+			interrupt-controller;
+			#interrupt-cells = <0x2>;
+		};
 	};
 };
-- 
1.8.1.4

[PATCH 1/5] gpio: pxa: remove dead code

[Linus Walleij]

On Thu, Jul 11, 2013 at 5:17 PM, Daniel Mack <zonque@gmail.com> wrote:

> Commit f87311743 ("ARM: mmp: add more compatible names in gpio driver")
> changed the driver logic to determine the number of available GPIOs from
> the compatible string, and hence obsoleted the (undocumented) child
> nodes that were previously necessary. However, it left some remainder
> which can be safely removed now.
>
> Also, this patch makes pxa_gpio_probe_dt() return the correct value in
> case irq_alloc_descs() fails.
>
> Signed-off-by: Daniel Mack <zonque@gmail.com>
> Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Arnd Bergmann <arnd@arndb.de>

Tentatively applied, Haojian, does this look allright?

Yours,
Linus Walleij

[PATCH 2/5] gpio: pxa: fix Documentation of interrupt-names property

[Linus Walleij]

On Thu, Jul 11, 2013 at 5:17 PM, Daniel Mack <zonque@gmail.com> wrote:

> The property name to pass names for interrupt resources is called
> "interrupt-names", not "interrupt-name". Fix it to avoid further
> confusion.
>
> Signed-off-by: Daniel Mack <zonque@gmail.com>
> Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Arnd Bergmann <arnd@arndb.de>

Obviously correct so applied.

Cc binding patches to devicetree at vger.kernel.org going
forward...

Yours,
Linus Walleij

[PATCH 1/5] gpio: pxa: remove dead code

[Haojian Zhuang]

On 22 July 2013 00:15, Linus Walleij <linus.walleij@linaro.org> wrote:
> On Thu, Jul 11, 2013 at 5:17 PM, Daniel Mack <zonque@gmail.com> wrote:
>
>> Commit f87311743 ("ARM: mmp: add more compatible names in gpio driver")
>> changed the driver logic to determine the number of available GPIOs from
>> the compatible string, and hence obsoleted the (undocumented) child
>> nodes that were previously necessary. However, it left some remainder
>> which can be safely removed now.
>>
>> Also, this patch makes pxa_gpio_probe_dt() return the correct value in
>> case irq_alloc_descs() fails.
>>
>> Signed-off-by: Daniel Mack <zonque@gmail.com>
>> Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
>> Cc: Linus Walleij <linus.walleij@linaro.org>
>> Cc: Arnd Bergmann <arnd@arndb.de>
>
> Tentatively applied, Haojian, does this look allright?
>
> Yours,
> Linus Walleij

This patch is good.

Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>

[PATCH 1/5] gpio: pxa: remove dead code

[Daniel Mack]

On 22.07.2013 09:14, Haojian Zhuang wrote:
> On 22 July 2013 00:15, Linus Walleij <linus.walleij@linaro.org> wrote:
>> On Thu, Jul 11, 2013 at 5:17 PM, Daniel Mack <zonque@gmail.com> wrote:
>>
>>> Commit f87311743 ("ARM: mmp: add more compatible names in gpio driver")
>>> changed the driver logic to determine the number of available GPIOs from
>>> the compatible string, and hence obsoleted the (undocumented) child
>>> nodes that were previously necessary. However, it left some remainder
>>> which can be safely removed now.
>>>
>>> Also, this patch makes pxa_gpio_probe_dt() return the correct value in
>>> case irq_alloc_descs() fails.
>>>
>>> Signed-off-by: Daniel Mack <zonque@gmail.com>
>>> Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
>>> Cc: Linus Walleij <linus.walleij@linaro.org>
>>> Cc: Arnd Bergmann <arnd@arndb.de>
>>
>> Tentatively applied, Haojian, does this look allright?
>>
>> Yours,
>> Linus Walleij
> 
> This patch is good.
> 
> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
> 

And what about the others? I think the first 3 patches of this series
can go through Linus W, and the other 2 should end up in the pxa tree,
right?


Thanks,
Daniel

[PATCH 1/5] gpio: pxa: remove dead code

[Linus Walleij]

On Thu, Jul 25, 2013 at 11:00 AM, Daniel Mack <zonque@gmail.com> wrote:

> And what about the others? I think the first 3 patches of this series
> can go through Linus W, and the other 2 should end up in the pxa tree,
> right?

Yes. They might need to build on top of the pinctrl tree.

Or, if there are no other things happening in the PXA tree for the
next merge window, I can take it into my tree, with the ACKs of
e.g. Eric and Olof Johansson.

Yours,
Linus Walleij

[PATCH 1/5] gpio: pxa: remove dead code

[Daniel Mack]

Haojian Zhuang <haojian.zhuang@linaro.org> wrote:
>On 25 July 2013 17:30, Linus Walleij <linus.walleij@linaro.org> wrote:
>
>> On Thu, Jul 25, 2013 at 11:00 AM, Daniel Mack <zonque@gmail.com>
>wrote:
>>
>> > And what about the others? I think the first 3 patches of this
>series
>> > can go through Linus W, and the other 2 should end up in the pxa
>tree,
>> > right?
>>
>> Yes. They might need to build on top of the pinctrl tree.
>>
>> Or, if there are no other things happening in the PXA tree for the
>> next merge window, I can take it into my tree, with the ACKs of
>> e.g. Eric and Olof Johansson.
>>
>> Yours,
>> Linus Walleij
>>
>
>It's OK to merge all patches into gpio git tree.

No, wait. I have some more patches coming soon, and they will cause conflicts then in the merge window. So please take the last two ones into the pxa repo, and only the gpio specific one through Linus W.


Thanks,
Daniel

>Acked-by: Haojian Zhuang <haojian.zhuang@linaro.org>

[PATCH 3/5] gpio: pxa: Documentation: provide example bindings for PXA3xx

[Haojian Zhuang]

On Thu, Jul 11, 2013 at 11:17 PM, Daniel Mack <zonque@gmail.com> wrote:
> Add another example to describe bindings that work for PXA3xx boards.
>
> Signed-off-by: Daniel Mack <zonque@gmail.com>
> ---
>  Documentation/devicetree/bindings/gpio/mrvl-gpio.txt | 15 ++++++++++++++-
>  1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt b/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt
> index 6641626..b2afdb2 100644
> --- a/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt
> +++ b/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt
> @@ -19,7 +19,7 @@ Required properties:
>  - gpio-controller : Marks the device node as a gpio controller.
>  - #gpio-cells : Should be one.  It is the pin number.
>
> -Example:
> +Example for a MMP platform:
>
>         gpio: gpio at d4019000 {
>                 compatible = "marvell,mmp-gpio";
> @@ -32,6 +32,19 @@ Example:
>                 #interrupt-cells = <1>;
>        };
>
> +Example for a PXA3xx platform:
> +
> +       gpio: gpio at 40e00000 {
> +               compatible = "intel,pxa3xx-gpio";
> +               reg = <0x40e00000 0x10000>;
> +               interrupt-names = "gpio0", "gpio1", "gpio_mux";
> +               interrupts = <8 9 10>;
> +               gpio-controller;
> +               #gpio-cells = <0x2>;
> +               interrupt-controller;
> +               #interrupt-cells = <0x2>;
> +       };
> +
>  * Marvell Orion GPIO Controller
>
>  Required properties:
> --
> 1.8.1.4
>
>

Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>

[PATCH 3/5] gpio: pxa: Documentation: provide example bindings for PXA3xx

[Daniel Mack]

On 04.08.2013 16:11, Haojian Zhuang wrote:
> On Thu, Jul 11, 2013 at 11:17 PM, Daniel Mack <zonque@gmail.com> wrote:
>> Add another example to describe bindings that work for PXA3xx boards.
>>
>> Signed-off-by: Daniel Mack <zonque@gmail.com>
>> ---
>>  Documentation/devicetree/bindings/gpio/mrvl-gpio.txt | 15 ++++++++++++++-
>>  1 file changed, 14 insertions(+), 1 deletion(-)
>>
>> diff --git a/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt b/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt
>> index 6641626..b2afdb2 100644
>> --- a/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt
>> +++ b/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt
>> @@ -19,7 +19,7 @@ Required properties:
>>  - gpio-controller : Marks the device node as a gpio controller.
>>  - #gpio-cells : Should be one.  It is the pin number.
>>
>> -Example:
>> +Example for a MMP platform:
>>
>>         gpio: gpio at d4019000 {
>>                 compatible = "marvell,mmp-gpio";
>> @@ -32,6 +32,19 @@ Example:
>>                 #interrupt-cells = <1>;
>>        };
>>
>> +Example for a PXA3xx platform:
>> +
>> +       gpio: gpio at 40e00000 {
>> +               compatible = "intel,pxa3xx-gpio";
>> +               reg = <0x40e00000 0x10000>;
>> +               interrupt-names = "gpio0", "gpio1", "gpio_mux";
>> +               interrupts = <8 9 10>;
>> +               gpio-controller;
>> +               #gpio-cells = <0x2>;
>> +               interrupt-controller;
>> +               #interrupt-cells = <0x2>;
>> +       };
>> +
>>  * Marvell Orion GPIO Controller
>>
>>  Required properties:
>> --
>> 1.8.1.4
>>
>>
> 
> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>

Ok, great, thanks Haojian.

Linus W, 4/5 and 5/5 will be picked and merged by Haojian's tree. That
makes more sense as I have more pxa patches coming.


Thanks,
Daniel

[PATCH 5/5] ARM: pxa: DTS: override gpio node in pxa3xx.dtsi

[Haojian Zhuang]

On 11 July 2013 23:17, Daniel Mack <zonque@gmail.com> wrote:
> The gpio controller node inherited from pxa2xx.dtsi won't work for
> pxa3xx SoCs, so let's override it in pxa3xx.dtsi.
>
> Signed-off-by: Daniel Mack <zonque@gmail.com>
> Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Arnd Bergmann <arnd@arndb.de>
> ---
>  arch/arm/boot/dts/pxa3xx.dtsi | 11 +++++++++++
>  1 file changed, 11 insertions(+)
>
> diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
> index f9d92da..83bb0ef 100644
> --- a/arch/arm/boot/dts/pxa3xx.dtsi
> +++ b/arch/arm/boot/dts/pxa3xx.dtsi
> @@ -28,5 +28,16 @@
>                         marvell,intc-priority;
>                         marvell,intc-nr-irqs = <56>;
>                 };
> +
> +               gpio: gpio at 40e00000 {
> +                       compatible = "intel,pxa3xx-gpio";
> +                       reg = <0x40e00000 0x10000>;
> +                       interrupt-names = "gpio0", "gpio1", "gpio_mux";
> +                       interrupts = <8 9 10>;
> +                       gpio-controller;
> +                       #gpio-cells = <0x2>;
> +                       interrupt-controller;
> +                       #interrupt-cells = <0x2>;
> +               };
>         };
>  };
> --
> 1.8.1.4
>

Applied.

Regards
Haojian

[PATCH 4/5] ARM: pxa: fix DT auxdata for pxa3xx-gpio

[Haojian Zhuang]

On 11 July 2013 23:17, Daniel Mack <zonque@gmail.com> wrote:
> Commit f87311743 ("ARM: mmp: add more compatible names in gpio driver")
> changed the DT match string for pxa3xx-gpio, but left the auxdata table
> unchanged.
>
> Signed-off-by: Daniel Mack <zonque@gmail.com>
> Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Arnd Bergmann <arnd@arndb.de>
> ---
>  arch/arm/mach-pxa/pxa-dt.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-pxa/pxa-dt.c b/arch/arm/mach-pxa/pxa-dt.c
> index 3835979..f6a2c4b 100644
> --- a/arch/arm/mach-pxa/pxa-dt.c
> +++ b/arch/arm/mach-pxa/pxa-dt.c
> @@ -28,7 +28,7 @@ static const struct of_dev_auxdata pxa3xx_auxdata_lookup[] __initconst = {
>         OF_DEV_AUXDATA("mrvl,pxa-uart",         0x40700000, "pxa2xx-uart.2", NULL),
>         OF_DEV_AUXDATA("mrvl,pxa-uart",         0x41600000, "pxa2xx-uart.3", NULL),
>         OF_DEV_AUXDATA("marvell,pxa-mmc",       0x41100000, "pxa2xx-mci.0", NULL),
> -       OF_DEV_AUXDATA("mrvl,pxa-gpio",         0x40e00000, "pxa-gpio", NULL),
> +       OF_DEV_AUXDATA("intel,pxa3xx-gpio",     0x40e00000, "pxa3xx-gpio", NULL),
>         OF_DEV_AUXDATA("marvell,pxa-ohci",      0x4c000000, "pxa27x-ohci", NULL),
>         OF_DEV_AUXDATA("mrvl,pxa-i2c",          0x40301680, "pxa2xx-i2c.0", NULL),
>         OF_DEV_AUXDATA("mrvl,pwri2c",           0x40f500c0, "pxa3xx-i2c.1", NULL),
> --
> 1.8.1.4
>

Applied.

Regards
Haojian