From patchwork Wed Sep 17 19:59:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Bresticker X-Patchwork-Id: 4926511 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 E714CBEEA5 for ; Wed, 17 Sep 2014 20:03:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BEBE82015D for ; Wed, 17 Sep 2014 20:03:12 +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 A86EF20117 for ; Wed, 17 Sep 2014 20:03:11 +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 1XULPi-0001Tl-7U; Wed, 17 Sep 2014 20:01:18 +0000 Received: from mail-oa0-f73.google.com ([209.85.219.73]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XULOS-0007sw-LD for linux-arm-kernel@lists.infradead.org; Wed, 17 Sep 2014 20:00:01 +0000 Received: by mail-oa0-f73.google.com with SMTP id o6so447681oag.4 for ; Wed, 17 Sep 2014 12:59:39 -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=kSNaoCuCXYj6VMdzwn4wBNhLHV/LfWVkYODXDHedrA0=; b=eQbbNxJYAawVjFQmfN0mU/jgWj1tKBI5JFoGYc0mLqa/YBmqab7icGss4JNPbP0V7V fi8zSDjaakrabo1qRrjg7rouXT1v4d5qKX6l1KysIRrJX80KsnUjhijkfdBYNE/O7eh0 cuQRjQI64Ad5d5Lh2UDk+7YNXDaDpp7uwijfhAWn5/AjG4sXoIdwyT9P1ubf9ArdxK8O nqmBM7JfDjdfDp7oP4p7IqUPOIU+rDe1fv1Cu3mQY/AdLFvcSCPbrYVBjXpudourBS8s uwoB2lcFn+eCU0pszb8GbFYxW9NUhQ4UYVLoNtP/Hm9+EeRdwFVG5Tox3pY/oKmcPcAh 5u7w== X-Gm-Message-State: ALoCoQnJNBZp4o2qFrvg+Bxy5nVI4WzTAvV31SPnGZXGGZRs5LnYhL/MCP22rt3QdYbgUfe5E3Av X-Received: by 10.50.28.81 with SMTP id z17mr786456igg.2.1410983979392; Wed, 17 Sep 2014 12:59:39 -0700 (PDT) Received: from corpmail-nozzle1-1.hot.corp.google.com ([100.108.1.104]) by gmr-mx.google.com with ESMTPS id e24si873850yhe.3.2014.09.17.12.59.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Sep 2014 12:59:39 -0700 (PDT) Received: from abrestic.mtv.corp.google.com ([172.22.65.70]) by corpmail-nozzle1-1.hot.corp.google.com with ESMTP id O25U5G7U.2; Wed, 17 Sep 2014 12:59:39 -0700 Received: by abrestic.mtv.corp.google.com (Postfix, from userid 137652) id 974A2220B61; Wed, 17 Sep 2014 12:59:37 -0700 (PDT) From: Andrew Bresticker To: Stephen Warren , Thierry Reding , linux-tegra@vger.kernel.org Subject: [PATCH v4 8/9] ARM: tegra: jetson-tk1: Add xHCI support Date: Wed, 17 Sep 2014 12:59:29 -0700 Message-Id: <1410983970-7043-9-git-send-email-abrestic@chromium.org> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 In-Reply-To: <1410983970-7043-1-git-send-email-abrestic@chromium.org> References: <1410983970-7043-1-git-send-email-abrestic@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140917_130000_756530_3CFFBBD8 X-CRM114-Status: GOOD ( 11.90 ) X-Spam-Score: -1.6 (-) 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 USB ports previously owned by the EHCI controllers to the xHCI controller. There is a mini-PCIe USB port (UTMI port 1) and a USB A connector (UTMI port 2, USB3 port 0). PCIe lane 0 is used for USB3 port 0. Signed-off-by: Andrew Bresticker Reviewed-by: Stephen Warren --- Changes from v3: - Assigned otg-0 to XUSB to avoid USB2.0 flakiness. Changes from v2: - Updated VBUS power supply names. Changes from v1: - Updated USB power supplies. --- arch/arm/boot/dts/tegra124-jetson-tk1.dts | 48 +++++++++++++++++-------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts index 624b0fb..dacb0d0 100644 --- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts +++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts @@ -1515,7 +1515,7 @@ regulator-always-on; }; - ldo0 { + avdd_1v05_run: ldo0 { regulator-name = "+1.05V_RUN_AVDD"; regulator-min-microvolt = <1050000>; regulator-max-microvolt = <1050000>; @@ -1619,15 +1619,40 @@ nvidia,sys-clock-req-active-high; }; + usb@0,70090000 { + status = "okay"; + phys = <&padctl TEGRA_XUSB_PADCTL_UTMI_P1>, /* mini-PCIe USB */ + <&padctl TEGRA_XUSB_PADCTL_UTMI_P2>, /* USB A */ + <&padctl TEGRA_XUSB_PADCTL_USB3_P0>; /* USB A */ + phy-names = "utmi-1", "utmi-2", "usb3-0"; + 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-2-supply = <&vdd_usb3_vbus>; + nvidia,usb3-port-0-lane = ; + padctl_default: pinmux { + otg { + nvidia,lanes = "otg-0", "otg-1", "otg-2"; + nvidia,function = "xusb"; + }; + usb3 { - nvidia,lanes = "pcie-0", "pcie-1"; + nvidia,lanes = "pcie-0"; nvidia,function = "usb3"; nvidia,iddq = <0>; + nvidia,usb2-port-num = <2>; }; pcie { @@ -1668,25 +1693,6 @@ }; }; - /* mini-PCIe USB */ - usb@0,7d004000 { - status = "okay"; - }; - - usb-phy@0,7d004000 { - status = "okay"; - }; - - /* USB A connector */ - usb@0,7d008000 { - status = "okay"; - }; - - usb-phy@0,7d008000 { - status = "okay"; - vbus-supply = <&vdd_usb3_vbus>; - }; - clocks { compatible = "simple-bus"; #address-cells = <1>;