aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-05-26 01:25:36 -0400
committerArnd Bergmann <arnd@arndb.de>2012-05-31 20:04:53 -0400
commit5910de9e2de453956c3a18816f4838d96ac86988 (patch)
tree941ae40e2248b7dad59e49012e8c27a2b3b7571a /arch/arm
parent4a85c7fa52d71806dd7389486f11eda907b49fd6 (diff)
ARM: ux500: Enable probing of pinctrl through Device Tree
The Nomadik GPIO controller now relies on Nomadik pinctrl, however the pinctrl driver is not currently started by any ux500 platform. This is requred or GPIOs do not work at all. Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/db8500.dtsi4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/db8500.dtsi b/arch/arm/boot/dts/db8500.dtsi
index 1fa5546b5971..4ad5160018cb 100644
--- a/arch/arm/boot/dts/db8500.dtsi
+++ b/arch/arm/boot/dts/db8500.dtsi
@@ -170,6 +170,10 @@
170 gpio-bank = <8>; 170 gpio-bank = <8>;
171 }; 171 };
172 172
173 pinctrl {
174 compatible = "stericsson,nmk_pinctrl";
175 };
176
173 usb@a03e0000 { 177 usb@a03e0000 {
174 compatible = "stericsson,db8500-musb", 178 compatible = "stericsson,db8500-musb",
175 "mentor,musb"; 179 "mentor,musb";