Add "syscon-otghs" property and remove the deprecated "ctrl-module"
property from MUSB devicetree node.

Since "omap_control_usbotg" devicetree node is no longer used, remove
it.

Signed-off-by: Kishon Vijay Abraham I <[email protected]>
---
 arch/arm/boot/dts/omap4.dtsi |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index b27634d..2fb49a5 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -854,12 +854,6 @@
                        };
                };
 
-               omap_control_usbotg: control-phy@4a00233c {
-                       compatible = "ti,control-phy-otghs";
-                       reg = <0x4a00233c 0x4>;
-                       reg-names = "otghs_control";
-               };
-
                usb_otg_hs: usb_otg_hs@4a0ab000 {
                        compatible = "ti,omap4-musb";
                        reg = <0x4a0ab000 0x7ff>;
@@ -872,7 +866,7 @@
                        multipoint = <1>;
                        num-eps = <16>;
                        ram-bits = <12>;
-                       ctrl-module = <&omap_control_usbotg>;
+                       syscon-otghs = <&scm_conf 0x33c>;
                };
 
                aes: aes@4b501000 {
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to