diff options
author | Jason Cooper <jason@lakedaemon.net> | 2013-05-09 12:06:57 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-05-09 12:06:57 -0400 |
commit | 914dc329ee11d6b1ecbebef802962dc06e78b942 (patch) | |
tree | 5beb4075e744b27cf0551b2098102974ad5a7c2b /arch/arm | |
parent | d5a2b34fddf0026712fd31324aae3fa363b16d20 (diff) |
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>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/omap3-beagle-xm.dts | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap3-evm.dts | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap3-overo.dtsi | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap3.dtsi | 1 |
4 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts index 5a31964ae339..3046d1f81be0 100644 --- a/arch/arm/boot/dts/omap3-beagle-xm.dts +++ b/arch/arm/boot/dts/omap3-beagle-xm.dts | |||
@@ -122,6 +122,7 @@ | |||
122 | 122 | ||
123 | &usb_otg_hs { | 123 | &usb_otg_hs { |
124 | interface-type = <0>; | 124 | interface-type = <0>; |
125 | usb-phy = <&usb2_phy>; | ||
125 | mode = <3>; | 126 | mode = <3>; |
126 | power = <50>; | 127 | power = <50>; |
127 | }; | 128 | }; |
diff --git a/arch/arm/boot/dts/omap3-evm.dts b/arch/arm/boot/dts/omap3-evm.dts index 05f51e10ddd6..96d1c206a57b 100644 --- a/arch/arm/boot/dts/omap3-evm.dts +++ b/arch/arm/boot/dts/omap3-evm.dts | |||
@@ -68,6 +68,7 @@ | |||
68 | 68 | ||
69 | &usb_otg_hs { | 69 | &usb_otg_hs { |
70 | interface-type = <0>; | 70 | interface-type = <0>; |
71 | usb-phy = <&usb2_phy>; | ||
71 | mode = <3>; | 72 | mode = <3>; |
72 | power = <50>; | 73 | power = <50>; |
73 | }; | 74 | }; |
diff --git a/arch/arm/boot/dts/omap3-overo.dtsi b/arch/arm/boot/dts/omap3-overo.dtsi index d4a7280d18b7..a626c50041f6 100644 --- a/arch/arm/boot/dts/omap3-overo.dtsi +++ b/arch/arm/boot/dts/omap3-overo.dtsi | |||
@@ -73,6 +73,7 @@ | |||
73 | 73 | ||
74 | &usb_otg_hs { | 74 | &usb_otg_hs { |
75 | interface-type = <0>; | 75 | interface-type = <0>; |
76 | usb-phy = <&usb2_phy>; | ||
76 | mode = <3>; | 77 | mode = <3>; |
77 | power = <50>; | 78 | power = <50>; |
78 | }; | 79 | }; |
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index 4ad03d9dbf0c..82a404da1c0d 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi | |||
@@ -519,7 +519,6 @@ | |||
519 | interrupts = <0 92 0x4>, <0 93 0x4>; | 519 | interrupts = <0 92 0x4>, <0 93 0x4>; |
520 | interrupt-names = "mc", "dma"; | 520 | interrupt-names = "mc", "dma"; |
521 | ti,hwmods = "usb_otg_hs"; | 521 | ti,hwmods = "usb_otg_hs"; |
522 | usb-phy = <&usb2_phy>; | ||
523 | multipoint = <1>; | 522 | multipoint = <1>; |
524 | num-eps = <16>; | 523 | num-eps = <16>; |
525 | ram-bits = <12>; | 524 | ram-bits = <12>; |