summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/ste-href.dtsi
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-11-13 15:59:40 +0100
committerLinus Walleij <linus.walleij@linaro.org>2013-11-26 21:01:55 +0100
commita12f703c5a27e2061fd0ea77200e5e2f8cfee54b (patch)
tree7fe922b21ee34e0c1a1ea6971adc91d1f92df695 /arch/arm/boot/dts/ste-href.dtsi
parentARM: ux500: move GPIO217/218 config to device tree (diff)
downloadlinux-a12f703c5a27e2061fd0ea77200e5e2f8cfee54b.tar.xz
linux-a12f703c5a27e2061fd0ea77200e5e2f8cfee54b.zip
ARM: ux500: move MUSB pin config to device tree
This moves the MUSB pin control table out of the board file and into the device tree. Tie the config to the on-chip MUSB device rather than the ab8500-usb device which is off-chip. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts/ste-href.dtsi')
-rw-r--r--arch/arm/boot/dts/ste-href.dtsi6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi
index 85260846deae..4fda2d933488 100644
--- a/arch/arm/boot/dts/ste-href.dtsi
+++ b/arch/arm/boot/dts/ste-href.dtsi
@@ -30,6 +30,12 @@
};
soc {
+ usb_per5@a03e0000 {
+ pinctrl-names = "default", "sleep";
+ pinctrl-0 = <&musb_default_mode>;
+ pinctrl-1 = <&musb_sleep_mode>;
+ };
+
uart@80120000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&uart0_default_mode>;