aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/ste-snowball.dts
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2017-01-12 15:22:42 +0100
committerLinus Walleij <linus.walleij@linaro.org>2017-01-31 22:14:47 +0100
commit6097c2d0afa4ff70ece8610875a0f0592064de29 (patch)
treec82d205ea9839ac883d3207344ea3896b0a3cae2 /arch/arm/boot/dts/ste-snowball.dts
parentARM: dts: push MMC/SD to board and add comments (diff)
downloadlinux-dev-6097c2d0afa4ff70ece8610875a0f0592064de29.tar.xz
linux-dev-6097c2d0afa4ff70ece8610875a0f0592064de29.zip
ARM: dts: Ux500: move USB PHY pins to PHY device
The physical pins from the SoC are in a sense belonging to the PHY device (AB8500 USB) rather than the MUSB USB IP block. The driver definately assumes so: before this change it complains that it cannot control the pins it is using: abx5x0-usb ab8500-usb.0: could not get/set default pinstate After this patch the warning goes away. Cc: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts/ste-snowball.dts')
-rw-r--r--arch/arm/boot/dts/ste-snowball.dts12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
index 7900e5d6aa05..d5f61256fe56 100644
--- a/arch/arm/boot/dts/ste-snowball.dts
+++ b/arch/arm/boot/dts/ste-snowball.dts
@@ -159,12 +159,6 @@
"", "", "", "", "", "", "", "";
};
- usb_per5@a03e0000 {
- pinctrl-names = "default", "sleep";
- pinctrl-0 = <&musb_default_mode>;
- pinctrl-1 = <&musb_sleep_mode>;
- };
-
sound {
compatible = "stericsson,snd-soc-mop500";
@@ -451,6 +445,12 @@
"PM_GPIO42"; /* AB8500 GPIO42 */
};
+ ab8500_usb {
+ pinctrl-names = "default", "sleep";
+ pinctrl-0 = <&musb_default_mode>;
+ pinctrl-1 = <&musb_sleep_mode>;
+ };
+
ext_regulators: ab8500-ext-regulators {
ab8500_ext1_reg: ab8500_ext1 {
regulator-name = "ab8500-ext-supply1";