From patchwork Thu Mar 13 09:18:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Carikli X-Patchwork-Id: 3823531 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6D64DBF540 for ; Thu, 13 Mar 2014 09:23:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8FAC42020A for ; Thu, 13 Mar 2014 09:23:18 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9858F20270 for ; Thu, 13 Mar 2014 09:23:16 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WO1p7-0000lw-AK; Thu, 13 Mar 2014 09:21:10 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WO1oc-0000oc-4q; Thu, 13 Mar 2014 09:20:38 +0000 Received: from smtp2-g21.free.fr ([2a01:e0c:1:1599::11]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WO1nY-0000Yz-7q for linux-arm-kernel@lists.infradead.org; Thu, 13 Mar 2014 09:19:33 +0000 Received: from denis-N73SV.local.eukrea.com (unknown [88.170.243.169]) by smtp2-g21.free.fr (Postfix) with ESMTP id 7A3EA4B017A; Thu, 13 Mar 2014 10:19:05 +0100 (CET) From: Denis Carikli To: Peter Chen Subject: [PATCH v4][ 4/8] ARM: dts: imx25.dtsi: Fix USB support. Date: Thu, 13 Mar 2014 10:18:42 +0100 Message-Id: <1394702326-25558-4-git-send-email-denis@eukrea.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1394702326-25558-1-git-send-email-denis@eukrea.com> References: <1394702326-25558-1-git-send-email-denis@eukrea.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140313_051932_939229_02F020FB X-CRM114-Status: GOOD ( 10.58 ) X-Spam-Score: -1.2 (-) Cc: Fabio Estevam , =?UTF-8?q?Eric=20B=C3=A9nard?= , Alexander Shiyan , linux-usb@vger.kernel.org, Denis Carikli , Sascha Hauer , Shawn Guo , Fabio Estevam , Sergei Shtylyov , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Fabio Estevam Signed-off-by: Fabio Estevam Signed-off-by: Denis Carikli --- Changelog v3->v4: - Added Fabio Estevam's Signed-off-by: it was given as a mail response to this patch. - Moved the compatible of usbphy on top to match the other nodes. - the usb phy's names were renamed from usbphy to usb-phy. - The patch renaming the fsl,usbphy property in usb-phy was removed. So this patch was adapted to that. Changelog v2->v3: - rebased on top of the "usb: chipidea: Use standard usb-phy property." patch. - Fixed the usbphy nodes index and added and added a reg property. Changelog v1->v2: - The usbphy nodes were made to look like the ones in imx53.dtsi - The patch was rebased on top of the clock fixes commits. --- arch/arm/boot/dts/imx25.dtsi | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi index 829791e..18f68f3 100644 --- a/arch/arm/boot/dts/imx25.dtsi +++ b/arch/arm/boot/dts/imx25.dtsi @@ -482,22 +482,13 @@ clocks = <&clks 99>; }; - usbphy1: usbphy@1 { - compatible = "nop-usbphy"; - status = "disabled"; - }; - - usbphy2: usbphy@2 { - compatible = "nop-usbphy"; - status = "disabled"; - }; - usbotg: usb@53ff4000 { compatible = "fsl,imx25-usb", "fsl,imx27-usb"; reg = <0x53ff4000 0x0200>; interrupts = <37>; clocks = <&clks 70>; fsl,usbmisc = <&usbmisc 0>; + fsl,usbphy = <&usbphy0>; status = "disabled"; }; @@ -507,6 +498,7 @@ interrupts = <35>; clocks = <&clks 70>; fsl,usbmisc = <&usbmisc 1>; + fsl,usbphy = <&usbphy1>; status = "disabled"; }; @@ -516,7 +508,6 @@ clocks = <&clks 9>, <&clks 70>, <&clks 8>; clock-names = "ipg", "ahb", "per"; reg = <0x53ff4600 0x00f>; - status = "disabled"; }; dryice@53ffc000 { @@ -548,4 +539,20 @@ }; }; }; + + usbphy { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; + + usbphy0: usb-phy@0 { + reg = <0>; + compatible = "usb-nop-xceiv"; + }; + + usbphy1: usb-phy@1 { + reg = <1>; + compatible = "usb-nop-xceiv"; + }; + }; };