From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933008AbbFWMC7 (ORCPT ); Tue, 23 Jun 2015 08:02:59 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:53450 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932785AbbFWMBO (ORCPT ); Tue, 23 Jun 2015 08:01:14 -0400 From: Kishon Vijay Abraham I To: , , , , , , , , , CC: , , , , , , , Subject: [PATCH 16/17] ARM: dts: omap4: Use "syscon-phy-power" instead of "ctrl-module" in USB PHY node Date: Tue, 23 Jun 2015 17:29:01 +0530 Message-ID: <1435060743-5511-17-git-send-email-kishon@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1435060743-5511-1-git-send-email-kishon@ti.com> References: <1435060743-5511-1-git-send-email-kishon@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@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 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