From patchwork Mon Aug 18 17:08:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Bresticker X-Patchwork-Id: 4738171 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 2DE5AC0338 for ; Mon, 18 Aug 2014 17:13:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4539620120 for ; Mon, 18 Aug 2014 17:13:23 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (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 601862011D for ; Mon, 18 Aug 2014 17:13:22 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XJQRJ-0003G2-Ai; Mon, 18 Aug 2014 17:09:49 +0000 Received: from mail-pa0-f74.google.com ([209.85.220.74]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XJQQT-0002bw-4z for linux-arm-kernel@lists.infradead.org; Mon, 18 Aug 2014 17:08:58 +0000 Received: by mail-pa0-f74.google.com with SMTP id lj1so1414203pab.1 for ; Mon, 18 Aug 2014 10:08:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tXrFcWqjFL0HLvv15+4RWG9JgaN8LvstSwRNGGJ7yvc=; b=lOiNdKzRtgeN7x4WH23tpSwJ1ldLHV7wb+1ai9wt5JPU4DndUxbjX3W/SGouQu2Ebs 0XpjACc98i86tmclvJ5VLy20ZB926dQ9eHtgckof0zo483e4Vo1tZMubCiXmvKSq5vtP 8ylWCxS5/8sDHsq3HAxbT5o/ZA7o529Cc2LoAHhJi72Zmil5Ui/K8mzEZs44aE20pDLQ lWm/lUhESP1bcGGaIyQDVR+z51MZ3Qg5cz024t1NAKAKGbWVSYoxcYNQGp5shqfOqb5q ykcgE6DzAifUq5RuifL9fP6LIevNuDThBg1bC/hihSjQpprREzIt0AE3+XhCN3SJnzxA PndA== X-Gm-Message-State: ALoCoQn9rFg7R+2pyIj6VPYJE/VDy6/GEpGyV51eNMRwXffx8canGSKdlhhp2w4ca3oqvyYit5hz X-Received: by 10.66.235.66 with SMTP id uk2mr805123pac.39.1408381716068; Mon, 18 Aug 2014 10:08:36 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id y50si68826yhk.4.2014.08.18.10.08.35 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Aug 2014 10:08:36 -0700 (PDT) Received: from abrestic.mtv.corp.google.com (abrestic.mtv.corp.google.com [172.22.65.70]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id B501F31C5AE; Mon, 18 Aug 2014 10:08:35 -0700 (PDT) Received: by abrestic.mtv.corp.google.com (Postfix, from userid 137652) id 78C1C220C35; Mon, 18 Aug 2014 10:08:35 -0700 (PDT) From: Andrew Bresticker To: Stephen Warren , Thierry Reding , linux-tegra@vger.kernel.org Subject: [PATCH v2 9/9] ARM: tegra: venice2: Add xHCI support Date: Mon, 18 Aug 2014 10:08:25 -0700 Message-Id: <1408381705-3623-10-git-send-email-abrestic@chromium.org> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 In-Reply-To: <1408381705-3623-1-git-send-email-abrestic@chromium.org> References: <1408381705-3623-1-git-send-email-abrestic@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140818_100857_255051_94F14747 X-CRM114-Status: GOOD ( 12.48 ) X-Spam-Score: -2.0 (--) Cc: Mark Rutland , devicetree@vger.kernel.org, linux-usb@vger.kernel.org, Russell King , Mathias Nyman , Pawel Moll , Ian Campbell , Andrew Bresticker , Greg Kroah-Hartman , Linus Walleij , Jassi Brar , linux-kernel@vger.kernel.org, Kishon Vijay Abraham I , Rob Herring , Alan Stern , linux-arm-kernel@lists.infradead.org, Kumar Gala , Grant Likely , Arnd Bergmann X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, 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 Assign ports previously owned by the EHCI controllers to the xHCI controller. There are two external USB ports (UTMI ports 0/2 and USB3 ports 0/1) and an internal USB port (UTMI port 1). PCIe lanes 0 and 1 are used by the USB3 ports. Signed-off-by: Andrew Bresticker --- Changes from v1: - Updated USB power supplies. --- arch/arm/boot/dts/tegra124-venice2.dts | 79 ++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 28 deletions(-) diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts index 70ad91d..3f706ff 100644 --- a/arch/arm/boot/dts/tegra124-venice2.dts +++ b/arch/arm/boot/dts/tegra124-venice2.dts @@ -736,7 +736,7 @@ regulator-always-on; }; - ldo0 { + avdd_1v05_run: ldo0 { regulator-name = "+1.05V_RUN_AVDD"; regulator-min-microvolt = <1050000>; regulator-max-microvolt = <1050000>; @@ -878,6 +878,56 @@ status = "okay"; }; + usb@0,70090000 { + status = "okay"; + phys = <&padctl TEGRA_XUSB_PADCTL_UTMI_P0>, /* 1st USB A */ + <&padctl TEGRA_XUSB_PADCTL_UTMI_P1>, /* Internal USB */ + <&padctl TEGRA_XUSB_PADCTL_UTMI_P2>, /* 2nd USB A */ + <&padctl TEGRA_XUSB_PADCTL_USB3_P0>, /* 1st USB A */ + <&padctl TEGRA_XUSB_PADCTL_USB3_P1>; /* 2nd USB A */ + phy-names = "utmi-0", "utmi-1", "utmi-2", "usb3-0", "usb3-1"; + avddio-pex-supply = <&vdd_1v05_run>; + dvddio-pex-supply = <&vdd_1v05_run>; + avdd-usb-supply = <&vdd_3v3_lp0>; + avdd-pll-utmip-supply = <&vddio_1v8>; + avdd-pll-erefe-supply = <&avdd_1v05_run>; + avdd-pex-pll-supply = <&vdd_1v05_run>; + hvdd-pex-supply = <&vdd_3v3_lp0>; + hvdd-pex-plle-supply = <&vdd_3v3_lp0>; + }; + + padctl@0,7009f000 { + pinctrl-0 = <&padctl_default>; + pinctrl-names = "default"; + + vbus-otg-0-supply = <&vdd_usb1_vbus>; + vbus-otg-1-supply = <&vdd_run_cam>; + vbus-otg-2-supply = <&vdd_usb3_vbus>; + nvidia,usb3-port-0-lane = ; + nvidia,usb3-port-1-lane = ; + + padctl_default: pinmux { + otg { + nvidia,lanes = "otg-0", "otg-1", "otg-2"; + nvidia,function = "xusb"; + }; + + usb3p0 { + nvidia,lanes = "pcie-0"; + nvidia,function = "usb3"; + nvidia,iddq = <0>; + nvidia,usb2-port-num = <0>; + }; + + usb3p1 { + nvidia,lanes = "pcie-1"; + nvidia,function = "usb3"; + nvidia,iddq = <0>; + nvidia,usb2-port-num = <2>; + }; + }; + }; + sdhci@0,700b0400 { cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>; power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>; @@ -898,33 +948,6 @@ }; }; - usb@0,7d000000 { - status = "okay"; - }; - - usb-phy@0,7d000000 { - status = "okay"; - vbus-supply = <&vdd_usb1_vbus>; - }; - - usb@0,7d004000 { - status = "okay"; - }; - - usb-phy@0,7d004000 { - status = "okay"; - vbus-supply = <&vdd_run_cam>; - }; - - usb@0,7d008000 { - status = "okay"; - }; - - usb-phy@0,7d008000 { - status = "okay"; - vbus-supply = <&vdd_usb3_vbus>; - }; - backlight: backlight { compatible = "pwm-backlight";