summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorDaniel Mack <zonque@gmail.com>2013-07-11 17:17:57 +0200
committerKevin Hilman <khilman@linaro.org>2013-08-14 00:51:02 +0200
commit93c5a5b179dfd79438c0744fc02af0abf11edbb9 (patch)
tree7aac76d5656514b4b93c526f3577fe3e23990299 /arch/arm/boot
parentARM: pxa: fix DT auxdata for pxa3xx-gpio (diff)
downloadlinux-93c5a5b179dfd79438c0744fc02af0abf11edbb9.tar.xz
linux-93c5a5b179dfd79438c0744fc02af0abf11edbb9.zip
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>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/pxa3xx.dtsi11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index f9d92da86783..83bb0eff697b 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@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>;
+ };
};
};