From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932896AbbFWMBf (ORCPT ); Tue, 23 Jun 2015 08:01:35 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:60728 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932826AbbFWMBV (ORCPT ); Tue, 23 Jun 2015 08:01:21 -0400 From: Kishon Vijay Abraham I To: , , , , , , , , , CC: , , , , , , , Subject: [PATCH 17/17] ARM: dts: omap4: Use "syscon-otghs" instead of "ctrl-module" in USB node Date: Tue, 23 Jun 2015 17:29:02 +0530 Message-ID: <1435060743-5511-18-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-otghs" property and remove the deprecated "ctrl-module" property from MUSB devicetree node. Since "omap_control_usbotg" 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 d0e0960..3bc77b1 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -852,12 +852,6 @@ }; }; - omap_control_usbotg: control-phy@4a00233c { - compatible = "ti,control-phy-otghs"; - reg = <0x4a00233c 0x4>; - reg-names = "otghs_control"; - }; - usb_otg_hs: usb_otg_hs@4a0ab000 { compatible = "ti,omap4-musb"; reg = <0x4a0ab000 0x7ff>; @@ -870,7 +864,7 @@ multipoint = <1>; num-eps = <16>; ram-bits = <12>; - ctrl-module = <&omap_control_usbotg>; + syscon-otghs = <&scm_conf 0x33c>; }; aes: aes@4b501000 { -- 1.7.9.5