From patchwork Thu Jul 2 08:14:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Edworthy X-Patchwork-Id: 6708181 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DBDF7C05AC for ; Thu, 2 Jul 2015 08:16:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1454F206E9 for ; Thu, 2 Jul 2015 08:16:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 203AE206E0 for ; Thu, 2 Jul 2015 08:16:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752084AbbGBIQu (ORCPT ); Thu, 2 Jul 2015 04:16:50 -0400 Received: from relmlor4.renesas.com ([210.160.252.174]:18449 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752621AbbGBIQl (ORCPT ); Thu, 2 Jul 2015 04:16:41 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie3.idc.renesas.com with ESMTP; 02 Jul 2015 17:16:40 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 4C9784E296; Thu, 2 Jul 2015 17:16:40 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 464582806E; Thu, 2 Jul 2015 17:16:40 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 424782806D; Thu, 2 Jul 2015 17:16:40 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id TAJ05761; Thu, 2 Jul 2015 17:16:40 +0900 X-IronPort-AV: E=Sophos;i="5.15,391,1432566000"; d="scan'208";a="189579729" Received: from unknown (HELO relay41.aps.necel.com) ([10.29.19.9]) by relmlii1.idc.renesas.com with ESMTP; 02 Jul 2015 17:16:40 +0900 Received: from DU0NOTES13.ad.ree.renesas.com ([172.29.24.131]) by relay41.aps.necel.com (8.14.4+Sun/8.14.4) with ESMTP id t628GXBa022560; Thu, 2 Jul 2015 17:16:34 +0900 (JST) Received: from localhost.localdomain ([172.29.43.47]) by DU0NOTES13.ad.ree.renesas.com (Lotus Domino Release 8.5.3 HF466) with ESMTP id 2015070210163306-65952 ; Thu, 2 Jul 2015 10:16:33 +0200 From: Phil Edworthy To: Simon Horman Cc: Magnus Damm , Kishon Vijay Abraham I , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Sergei Shtylyov , Yoshihiro Shimoda , , , , , Phil Edworthy X-Mailer: git-send-email 1.9.1 X-TNEFEvaluated: 1 Message-ID: <1435824869-22784-1-git-send-email-phil.edworthy@renesas.com> Date: Thu, 2 Jul 2015 09:14:29 +0100 Subject: [PATCH v2] arm: koelsch: make USB0 perform Host/Function switching X-MIMETrack: Itemize by SMTP Server on DU0NOTES13/SERVER/REE(Release 8.5.3 HF466|March 09, 2012) at 02.07.2015 10:16:33, Serialize by Router on DU0NOTES13/SERVER/REE(Release 8.5.3 HF466|March 09, 2012) at 02.07.2015 10:16:34, Serialize complete at 02.07.2015 10:16:34 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Both USB Host (pci0) and Function (USBHS) drivers are enabled. The USB PHY driver determines which IP block should be connected based on vbus and id signals read via gpios. Note that switch SW5 and SW6 on Koelsch board needs to be set to position 3 for this to work. --- Not for upstream until the following patches have been accepted: "usb: renesas_usbhs: Allow an OTG PHY driver to provide VBUS" "phy: rcar-gen2 usb: Add Host/Function switching for USB0" Hence, not signed off. v2: - Added -gpio to dts prop names of GPIO pins. --- arch/arm/boot/dts/r8a7791-koelsch.dts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts index cffe33f..1bb34d0 100644 --- a/arch/arm/boot/dts/r8a7791-koelsch.dts +++ b/arch/arm/boot/dts/r8a7791-koelsch.dts @@ -615,7 +615,6 @@ &pci0 { status = "okay"; - pinctrl-0 = <&usb0_pins>; pinctrl-names = "default"; }; @@ -627,13 +626,15 @@ &hsusb { status = "okay"; - pinctrl-0 = <&usb0_pins>; pinctrl-names = "default"; - renesas,enable-gpio = <&gpio5 31 GPIO_ACTIVE_HIGH>; }; &usbphy { status = "okay"; + renesas,pwr-gpio = <&gpio2 4 GPIO_ACTIVE_HIGH>; + renesas,id-gpio = <&gpio5 31 GPIO_ACTIVE_HIGH>; + renesas,vbus-gpio = <&gpio7 24 GPIO_ACTIVE_HIGH>; + renesas,vbus-pwr-gpio = <&gpio7 23 GPIO_ACTIVE_HIGH>; }; &pcie_bus_clk {