From patchwork Mon Nov 17 22:41:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Bresticker X-Patchwork-Id: 5324121 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 ACBEBC11AC for ; Mon, 17 Nov 2014 22:46:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D067E20125 for ; Mon, 17 Nov 2014 22:46:26 +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 E44E1200D5 for ; Mon, 17 Nov 2014 22:46:25 +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 1XqV1Y-0004bk-59; Mon, 17 Nov 2014 22:43:56 +0000 Received: from mail-qc0-f202.google.com ([209.85.216.202]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XqUzv-0003dG-Co for linux-arm-kernel@lists.infradead.org; Mon, 17 Nov 2014 22:42:17 +0000 Received: by mail-qc0-f202.google.com with SMTP id i17so261184qcy.1 for ; Mon, 17 Nov 2014 14:41:52 -0800 (PST) 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=rTYzf8q6+rth4p3Et2TIo/X/ZF8FNSHiKJRdty1g5Hs=; b=QyReEEZ6INJKtFtvt3n9wYJFtRMGv9CqbP0i/S3S1nuaCY9sTDmKdtH9uZiKHGh+30 Uit7PxdBdpXB4X8ydSD/WEh+mJTTSswEgjsz+0puoD2cr01+UKderBAQX5Wx9I7ww2oy uT63xXLs2fCEhIJlnvciovk5rObdSaj64zKeaCg4PkoSV3Qaq148XrQnnjdF+pcE/y0l pS7P1ncf5yoS5h4/EExMPF1+SqGXKv32k4Bu8ER93jzjJYg1U8TW1PQsodiV4EJivGOP 1v3YkaWnm1KZf5ydzqBRyCHRfoPVwWR45vmv7R31YSI3bK3EwgYYoYDOpU0VoUQvo8+y etpg== X-Gm-Message-State: ALoCoQnayy5yAdxJqvv/AQRbXIalKnPIhJA+lquG/ka5r5keZQ9V0gXtD9QYHrxd+lD1eE+72xQJ X-Received: by 10.236.16.194 with SMTP id h42mr70426705yhh.13.1416264112472; Mon, 17 Nov 2014 14:41:52 -0800 (PST) Received: from corpmail-nozzle1-1.hot.corp.google.com ([100.108.1.104]) by gmr-mx.google.com with ESMTPS id lu9si6040799qcb.0.2014.11.17.14.41.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Nov 2014 14:41:52 -0800 (PST) Received: from abrestic.mtv.corp.google.com ([172.22.65.70]) by corpmail-nozzle1-1.hot.corp.google.com with ESMTP id GBsgcZW1.2; Mon, 17 Nov 2014 14:41:52 -0800 Received: by abrestic.mtv.corp.google.com (Postfix, from userid 137652) id 3DCFF220DEC; Mon, 17 Nov 2014 14:41:50 -0800 (PST) From: Andrew Bresticker To: Stephen Warren , Thierry Reding , Alexandre Courbot , linux-tegra@vger.kernel.org Subject: [PATCH V5 12/12] ARM: tegra: venice2: Add xHCI support Date: Mon, 17 Nov 2014 14:41:42 -0800 Message-Id: <1416264102-1323-13-git-send-email-abrestic@chromium.org> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 In-Reply-To: <1416264102-1323-1-git-send-email-abrestic@chromium.org> References: <1416264102-1323-1-git-send-email-abrestic@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141117_144215_551915_4E7BB3B4 X-CRM114-Status: GOOD ( 12.43 ) X-Spam-Score: -0.7 (/) 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 , Olof Johansson , 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_LOW, 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 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 Reviewed-by: Stephen Warren --- Changes from v4: - Updated regulator and pinconfig properties. No changes from v3. Changes from v2: - Updated VBUS power supply names. 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 1300885..24a8bb8 100644 --- a/arch/arm/boot/dts/tegra124-venice2.dts +++ b/arch/arm/boot/dts/tegra124-venice2.dts @@ -744,7 +744,7 @@ regulator-always-on; }; - ldo0 { + avdd_1v05_run: ldo0 { regulator-name = "+1.05V_RUN_AVDD"; regulator-min-microvolt = <1050000>; regulator-max-microvolt = <1050000>; @@ -886,6 +886,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-usb-ss-pll-supply = <&vdd_1v05_run>; + hvdd-usb-ss-supply = <&vdd_3v3_lp0>; + hvdd-usb-ss-pll-e-supply = <&vdd_3v3_lp0>; + }; + + padctl@0,7009f000 { + pinctrl-0 = <&padctl_default>; + pinctrl-names = "default"; + + vbus-0-supply = <&vdd_usb1_vbus>; + vbus-1-supply = <&vdd_run_cam>; + vbus-2-supply = <&vdd_usb3_vbus>; + + 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 = <0>; + nvidia,usb3-port = <0>; + }; + + usb3p1 { + nvidia,lanes = "pcie-1"; + nvidia,function = "usb3"; + nvidia,iddq = <0>; + nvidia,usb2-port = <2>; + nvidia,usb3-port = <1>; + }; + }; + }; + sdhci@0,700b0400 { cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>; power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>; @@ -906,33 +956,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";