ARM: pxa: DTS: override gpio node in pxa3xx.dtsi

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>

diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index f9d92da86783d75d00788b3104abd995c6022bce..83bb0eff697b8648b347c4fb936101c03dc6d4d5 100644 (file)
--- 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@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>;
+               };
        };
 };