ARM: dts: don't assume boards are using twl4030 for omap3

If a board isn't using twl4030, then dtc will complain about the missing
phandle (which is in twl4030.dtsi).  Move the phy declaration to the dts
files.

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
index 5a31964ae3396e0fa34ad632003ad8d1306f355b..3046d1f81be004a320acf61d123c732a98266088 100644 (file)
--- a/arch/arm/boot/dts/omap3-beagle-xm.dts
+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
@@ -122,6 +122,7 @@
 
 &usb_otg_hs {
        interface-type = <0>;
+       usb-phy = <&usb2_phy>;
        mode = <3>;
        power = <50>;
 };

diff --git a/arch/arm/boot/dts/omap3-evm.dts b/arch/arm/boot/dts/omap3-evm.dts
index 05f51e10ddd6730fcccc83a594f74cb550e7f181..96d1c206a57b9f201309166faa466aafed927a8b 100644 (file)
--- a/arch/arm/boot/dts/omap3-evm.dts
+++ b/arch/arm/boot/dts/omap3-evm.dts
@@ -68,6 +68,7 @@
 
 &usb_otg_hs {
        interface-type = <0>;
+       usb-phy = <&usb2_phy>;
        mode = <3>;
        power = <50>;
 };

diff --git a/arch/arm/boot/dts/omap3-overo.dtsi b/arch/arm/boot/dts/omap3-overo.dtsi
index d4a7280d18b7cdfc82f4bfaa71177a60b09c9ca5..a626c50041f6e91c8959f9aab674d3f0775a71d2 100644 (file)
--- a/arch/arm/boot/dts/omap3-overo.dtsi
+++ b/arch/arm/boot/dts/omap3-overo.dtsi
@@ -73,6 +73,7 @@
 
 &usb_otg_hs {
        interface-type = <0>;
+       usb-phy = <&usb2_phy>;
        mode = <3>;
        power = <50>;
 };

diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 4ad03d9dbf0ce653fb655416ec3fdc76eb54bdde..82a404da1c0d9531b632e265943632e7ea48d468 100644 (file)
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -519,7 +519,6 @@
                        interrupts = <0 92 0x4>, <0 93 0x4>;
                        interrupt-names = "mc", "dma";
                        ti,hwmods = "usb_otg_hs";
-                       usb-phy = <&usb2_phy>;
                        multipoint = <1>;
                        num-eps = <16>;
                        ram-bits = <12>;