Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756955AbbGGMSy (ORCPT ); Tue, 7 Jul 2015 08:18:54 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:18857 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752926AbbGGMSo (ORCPT ); Tue, 7 Jul 2015 08:18:44 -0400 X-IronPort-AV: E=Sophos;i="5.15,422,1432566000"; d="scan'208";a="191051227" 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 In-Reply-To: <20150703001430.GB20396@verge.net.au> References: <20150703001430.GB20396@verge.net.au> X-TNEFEvaluated: 1 Message-ID: <1436271394-25964-1-git-send-email-phil.edworthy@renesas.com> Date: Tue, 7 Jul 2015 13:16:34 +0100 Subject: [PATCH v4] ARM: shmobile: 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 07.07.2015 14:18:37, Serialize by Router on DU0NOTES13/SERVER/REE(Release 8.5.3 HF466|March 09, 2012) at 07.07.2015 14:18:38, Serialize complete at 07.07.2015 14:18:38 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1814 Lines: 66 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. Signed-off-by: Phil Edworthy --- 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. v4: - Changed prefix in title. v3: - Remove "pinctrl-names" as well as "pinctrl-0" props. v2: - Added -gpio to dts prop names of GPIO pins. --- arch/arm/boot/dts/r8a7791-koelsch.dts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts index cffe33f..21c2fdc 100644 --- a/arch/arm/boot/dts/r8a7791-koelsch.dts +++ b/arch/arm/boot/dts/r8a7791-koelsch.dts @@ -615,8 +615,6 @@ &pci0 { status = "okay"; - pinctrl-0 = <&usb0_pins>; - pinctrl-names = "default"; }; &pci1 { @@ -627,13 +625,14 @@ &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 { -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/