| Message ID | 1438702233-8027-8-git-send-email-kishon@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 04/08/15 18:30, Kishon Vijay Abraham I wrote: > Add "syscon-phy-power" property and remove the deprecated "ctrl-module" > property from USB PHY devicetree node. > > Since "omap_control_usb2phy" and "omap_control_usb3phy" devicetree nodes > are no longer used, remove it. > > Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Acked-by: Roger Quadros <rogerq@ti.com> cheers, -roger > --- > arch/arm/boot/dts/omap5.dtsi | 16 ++-------------- > 1 file changed, 2 insertions(+), 14 deletions(-) > > diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi > index c8fd648..f0b6cd6 100644 > --- a/arch/arm/boot/dts/omap5.dtsi > +++ b/arch/arm/boot/dts/omap5.dtsi > @@ -848,18 +848,6 @@ > hw-caps-temp-alert; > }; > > - omap_control_usb2phy: control-phy@4a002300 { > - compatible = "ti,control-phy-usb2"; > - reg = <0x4a002300 0x4>; > - reg-names = "power"; > - }; > - > - omap_control_usb3phy: control-phy@4a002370 { > - compatible = "ti,control-phy-pipe3"; > - reg = <0x4a002370 0x4>; > - reg-names = "power"; > - }; > - > usb3: omap_dwc3@4a020000 { > compatible = "ti,dwc3"; > ti,hwmods = "usb_otg_ss"; > @@ -890,7 +878,7 @@ > usb2_phy: usb2phy@4a084000 { > compatible = "ti,omap-usb2"; > reg = <0x4a084000 0x7c>; > - ctrl-module = <&omap_control_usb2phy>; > + syscon-phy-power = <&scm_conf 0x300>; > clocks = <&usb_phy_cm_clk32k>, <&usb_otg_ss_refclk960m>; > clock-names = "wkupclk", "refclk"; > #phy-cells = <0>; > @@ -902,7 +890,7 @@ > <0x4a084800 0x64>, > <0x4a084c00 0x40>; > reg-names = "phy_rx", "phy_tx", "pll_ctrl"; > - ctrl-module = <&omap_control_usb3phy>; > + syscon-phy-power = <&scm_conf 0x370>; > clocks = <&usb_phy_cm_clk32k>, > <&sys_clkin>, > <&usb_otg_ss_refclk960m>; >
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi index c8fd648..f0b6cd6 100644 --- a/arch/arm/boot/dts/omap5.dtsi +++ b/arch/arm/boot/dts/omap5.dtsi @@ -848,18 +848,6 @@ hw-caps-temp-alert; }; - omap_control_usb2phy: control-phy@4a002300 { - compatible = "ti,control-phy-usb2"; - reg = <0x4a002300 0x4>; - reg-names = "power"; - }; - - omap_control_usb3phy: control-phy@4a002370 { - compatible = "ti,control-phy-pipe3"; - reg = <0x4a002370 0x4>; - reg-names = "power"; - }; - usb3: omap_dwc3@4a020000 { compatible = "ti,dwc3"; ti,hwmods = "usb_otg_ss"; @@ -890,7 +878,7 @@ usb2_phy: usb2phy@4a084000 { compatible = "ti,omap-usb2"; reg = <0x4a084000 0x7c>; - ctrl-module = <&omap_control_usb2phy>; + syscon-phy-power = <&scm_conf 0x300>; clocks = <&usb_phy_cm_clk32k>, <&usb_otg_ss_refclk960m>; clock-names = "wkupclk", "refclk"; #phy-cells = <0>; @@ -902,7 +890,7 @@ <0x4a084800 0x64>, <0x4a084c00 0x40>; reg-names = "phy_rx", "phy_tx", "pll_ctrl"; - ctrl-module = <&omap_control_usb3phy>; + syscon-phy-power = <&scm_conf 0x370>; clocks = <&usb_phy_cm_clk32k>, <&sys_clkin>, <&usb_otg_ss_refclk960m>;
Add "syscon-phy-power" property and remove the deprecated "ctrl-module" property from USB PHY devicetree node. Since "omap_control_usb2phy" and "omap_control_usb3phy" devicetree nodes are no longer used, remove it. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- arch/arm/boot/dts/omap5.dtsi | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-)