* Kishon Vijay Abraham I <kishon@xxxxxx> [150623 05:02]:
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -852,12 +852,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>;
@@ -870,7 +864,7 @@
multipoint = <1>;
num-eps = <16>;
ram-bits = <12>;
- ctrl-module = <&omap_control_usbotg>;
+ syscon-otghs = <&scm_conf 0x33c>;
};
aes: aes@4b501000 {
We should still keep a separate entry for the phy in the dtsi
files. And the phy should be a child of the scm_conf area in the
dtsi file.
This is because the scm and usb_otg_hs are separate devices and
can be clocked separately. So the phy driver needs to be a
separate driver to avoid spaghetti code and issues with clocking.