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>

diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi
index 1b59943ab6ecebbc9f5bc309d0b21ec88d7adbd4..865da025996303566a0abb4646e4721ecc127bc5 100644 (file)
--- a/arch/arm/boot/dts/ste-href.dtsi
+++ b/arch/arm/boot/dts/ste-href.dtsi
@@ -19,12 +19,6 @@
        };
 
        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>;
@@ -225,6 +219,12 @@
                                ab8500-gpio {
                                };
 
+                               ab8500_usb {
+                                       pinctrl-names = "default", "sleep";
+                                       pinctrl-0 = <&musb_default_mode>;
+                                       pinctrl-1 = <&musb_sleep_mode>;
+                               };
+
                                ab8500-regulators {
                                        ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
                                                regulator-name = "V-DISPLAY";

diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
index 7900e5d6aa05bcf584dc2a13e590cf999017d44f..d5f61256fe56ab03821db7f98b85bbadd4d5c255 100644 (file)
--- 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";