Add "syscon-phy-power" property and remove the deprecated "ctrl-module" property from USB PHY dt node. Since "omap_control_usb2phy" devicetree node is no longer used, remove it. Signed-off-by: Kishon Vijay Abraham I <kishon@xxxxxx> --- 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 f884d6a..d0e0960 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -701,7 +701,7 @@ usb2_phy: usb2phy@4a0ad080 { compatible = "ti,omap-usb2"; reg = <0x4a0ad080 0x58>; - ctrl-module = <&omap_control_usb2phy>; + syscon-phy-power = <&scm_conf 0x300>; clocks = <&usb_phy_cm_clk32k>; clock-names = "wkupclk"; #phy-cells = <0>; @@ -852,12 +852,6 @@ }; }; - omap_control_usb2phy: control-phy@4a002300 { - compatible = "ti,control-phy-usb2"; - reg = <0x4a002300 0x4>; - reg-names = "power"; - }; - omap_control_usbotg: control-phy@4a00233c { compatible = "ti,control-phy-otghs"; reg = <0x4a00233c 0x4>; -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html