From patchwork Mon Jun 22 14:42:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Edworthy X-Patchwork-Id: 6656151 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 49A15C05AC for ; Mon, 22 Jun 2015 14:45:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AD13B205C6 for ; Mon, 22 Jun 2015 14:45:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C7109205C2 for ; Mon, 22 Jun 2015 14:45:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752539AbbFVOpT (ORCPT ); Mon, 22 Jun 2015 10:45:19 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:20296 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752474AbbFVOpP (ORCPT ); Mon, 22 Jun 2015 10:45:15 -0400 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie2.idc.renesas.com with ESMTP; 22 Jun 2015 23:45:13 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id A34B24D596; Mon, 22 Jun 2015 23:45:13 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 8177F2806E; Mon, 22 Jun 2015 23:45:13 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 514E82806D; Mon, 22 Jun 2015 23:45:13 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id ZAS22606; Mon, 22 Jun 2015 23:45:13 +0900 X-IronPort-AV: E=Sophos;i="5.13,659,1427727600"; d="scan'208";a="188845843" Received: from unknown (HELO relay41.aps.necel.com) ([10.29.19.9]) by relmlii1.idc.renesas.com with ESMTP; 22 Jun 2015 23:45:13 +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 t5MEjC1P025660; Mon, 22 Jun 2015 23:45:12 +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 2015062216451102-54400 ; Mon, 22 Jun 2015 16:45:11 +0200 From: Phil Edworthy To: Kishon Vijay Abraham I , Yoshihiro Shimoda , Simon Horman Cc: Sergei Shtylyov , , , , Phil Edworthy X-Mailer: git-send-email 1.9.1 In-Reply-To: <1434984151-27274-1-git-send-email-phil.edworthy@renesas.com> References: <1434984151-27274-1-git-send-email-phil.edworthy@renesas.com> X-TNEFEvaluated: 1 Message-ID: <1434984151-27274-4-git-send-email-phil.edworthy@renesas.com> Date: Mon, 22 Jun 2015 15:42:31 +0100 Subject: [PATCH 3/3] 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 22.06.2015 16:45:11, Serialize by Router on DU0NOTES13/SERVER/REE(Release 8.5.3 HF466|March 09, 2012) at 22.06.2015 16:45:12, Serialize complete at 22.06.2015 16:45:12 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-8.3 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. Signed-off-by: Phil Edworthy --- 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..8f394be 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 = <&gpio2 4 GPIO_ACTIVE_HIGH>; + renesas,id = <&gpio5 31 GPIO_ACTIVE_HIGH>; + renesas,vbus = <&gpio7 24 GPIO_ACTIVE_HIGH>; + renesas,vbus-pwr = <&gpio7 23 GPIO_ACTIVE_HIGH>; }; &pcie_bus_clk {