From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kishon Vijay Abraham I Subject: [PATCH 09/10] ARM: dts: omap4: Use "syscon-phy-power" instead of "ctrl-module" in USB PHY node Date: Tue, 4 Aug 2015 21:00:32 +0530 Message-ID: <1438702233-8027-10-git-send-email-kishon@ti.com> References: <1438702233-8027-1-git-send-email-kishon@ti.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <1438702233-8027-1-git-send-email-kishon@ti.com> Sender: linux-kernel-owner@vger.kernel.org To: rogerq@ti.com, tony@atomide.com, t-kristo@ti.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: balbi@ti.com, bcousson@baylibre.com, linux@arm.linux.org.uk, nsekhar@ti.com, kishon@ti.com List-Id: devicetree@vger.kernel.org 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 --- 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 7d31c6f..b27634d 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -703,7 +703,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>; @@ -854,12 +854,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