summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-05-26 06:25:36 +0100
committerArnd Bergmann <arnd@arndb.de>2012-06-01 02:04:53 +0200
commit5910de9e2de453956c3a18816f4838d96ac86988 (patch)
tree941ae40e2248b7dad59e49012e8c27a2b3b7571a /arch/arm/boot
parent4a85c7fa52d71806dd7389486f11eda907b49fd6 (diff)
downloadlinux-5910de9e2de453956c3a18816f4838d96ac86988.tar.gz
linux-5910de9e2de453956c3a18816f4838d96ac86988.tar.bz2
linux-5910de9e2de453956c3a18816f4838d96ac86988.zip
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/boot')
-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 @@
gpio-bank = <8>;
};
+ pinctrl {
+ compatible = "stericsson,nmk_pinctrl";
+ };
+
usb@a03e0000 {
compatible = "stericsson,db8500-musb",
"mentor,musb";