From mboxrd@z Thu Jan 1 00:00:00 1970 From: rogerq@ti.com (Roger Quadros) Date: Wed, 5 Aug 2015 10:58:02 +0300 Subject: [PATCH 06/10] ARM: dts: am4372: Use "syscon-phy-power" instead of "ctrl-module" in USB PHY node In-Reply-To: <1438702233-8027-7-git-send-email-kishon@ti.com> References: <1438702233-8027-1-git-send-email-kishon@ti.com> <1438702233-8027-7-git-send-email-kishon@ti.com> Message-ID: <55C1C20A.5070003@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 device tree node. > > Since "am43xx_control_usb2phy1" and "am43xx_control_usb2phy2" > devicetree nodes are no longer used, remove it. > > Signed-off-by: Kishon Vijay Abraham I Acked-by: Roger Quadros cheers, -roger > --- > arch/arm/boot/dts/am4372.dtsi | 16 ++-------------- > 1 file changed, 2 insertions(+), 14 deletions(-) > > diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi > index ade28c79..24fa073 100644 > --- a/arch/arm/boot/dts/am4372.dtsi > +++ b/arch/arm/boot/dts/am4372.dtsi > @@ -802,18 +802,6 @@ > status = "disabled"; > }; > > - am43xx_control_usb2phy1: control-phy at 44e10620 { > - compatible = "ti,control-phy-usb2-am437"; > - reg = <0x44e10620 0x4>; > - reg-names = "power"; > - }; > - > - am43xx_control_usb2phy2: control-phy at 0x44e10628 { > - compatible = "ti,control-phy-usb2-am437"; > - reg = <0x44e10628 0x4>; > - reg-names = "power"; > - }; > - > ocp2scp0: ocp2scp at 483a8000 { > compatible = "ti,am437x-ocp2scp", "ti,omap-ocp2scp"; > #address-cells = <1>; > @@ -824,7 +812,7 @@ > usb2_phy1: phy at 483a8000 { > compatible = "ti,am437x-usb2"; > reg = <0x483a8000 0x8000>; > - ctrl-module = <&am43xx_control_usb2phy1>; > + syscon-phy-power = <&scm_conf 0x620>; > clocks = <&usb_phy0_always_on_clk32k>, > <&usb_otg_ss0_refclk960m>; > clock-names = "wkupclk", "refclk"; > @@ -843,7 +831,7 @@ > usb2_phy2: phy at 483e8000 { > compatible = "ti,am437x-usb2"; > reg = <0x483e8000 0x8000>; > - ctrl-module = <&am43xx_control_usb2phy2>; > + syscon-phy-power = <&scm_conf 0x628>; > clocks = <&usb_phy1_always_on_clk32k>, > <&usb_otg_ss1_refclk960m>; > clock-names = "wkupclk", "refclk"; >