From patchwork Wed Jun 18 06:16:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Bresticker X-Patchwork-Id: 4373421 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 0EC51BEEAA for ; Wed, 18 Jun 2014 06:21:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3F6E82017D for ; Wed, 18 Jun 2014 06:21:10 +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 67DB3200E5 for ; Wed, 18 Jun 2014 06:21:09 +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 1Wx9Cn-0005zx-8E; Wed, 18 Jun 2014 06:18:45 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wx9BD-0005L5-6P for linux-arm-kernel@bombadil.infradead.org; Wed, 18 Jun 2014 06:17:07 +0000 Received: from mail-oa0-f74.google.com ([209.85.219.74]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wx9BA-00079D-Lj for linux-arm-kernel@lists.infradead.org; Wed, 18 Jun 2014 06:17:05 +0000 Received: by mail-oa0-f74.google.com with SMTP id i7so107200oag.5 for ; Tue, 17 Jun 2014 23:16:41 -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=ymtR+8YLVkDn91MytzPdZO2XGQC9zqFMe2GcF5TL3UA=; b=DWIGXi8nkwPvFRFqb7zMiISfzAdt4B1nkS4RjCfSMMfBeXtIaRmrjUvd8SDri9ttUV OXM4j1HoLgUewllyXs38lEIDjJaB4NWO9/i78cKX4ecSULIXeXhcD3ulWs6beHVIE7pH dSMxxQvJW4ii6JdRmtRQ0UnxDUDb45TpCu8yjHL6mvbrTkfVxAaaMbSTd3IXgbCpi8+i eYGOiwqfugmgV+8p4ai4oKQHeJonmDedV+gahnW0DLwAFKU3M2Z2l5iy6cbrxosqLnJE Yq+67pB2Fshlh6xvrMwacWgFN8CkPkd5egnyKn3u4FYNh8uPxT7uAYqQwVRt+ErSGVPp 7cug== X-Gm-Message-State: ALoCoQlSutF4rkPvlR+THoejf70o71J5XSgIFUcTDYnVn1pWHJPRUBo8pkUfiKcwxkK6re1JCnK0 X-Received: by 10.182.246.7 with SMTP id xs7mr1385176obc.15.1403072201814; Tue, 17 Jun 2014 23:16:41 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id o69si72380yhp.6.2014.06.17.23.16.41 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Jun 2014 23:16:41 -0700 (PDT) Received: from abrestic.mtv.corp.google.com (abrestic.mtv.corp.google.com [172.22.72.111]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 98F7A5A449E; Tue, 17 Jun 2014 23:16:41 -0700 (PDT) Received: by abrestic.mtv.corp.google.com (Postfix, from userid 137652) id 5D55D220378; Tue, 17 Jun 2014 23:16:41 -0700 (PDT) From: Andrew Bresticker To: devicetree@vger.kernel.org, linux-doc@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-usb@vger.kernel.org Subject: [PATCH v1 8/9] ARM: tegra: jetson-tk1: Add XHCI support Date: Tue, 17 Jun 2014 23:16:19 -0700 Message-Id: <1403072180-4944-9-git-send-email-abrestic@chromium.org> X-Mailer: git-send-email 2.0.0.526.g5318336 In-Reply-To: <1403072180-4944-1-git-send-email-abrestic@chromium.org> References: <1403072180-4944-1-git-send-email-abrestic@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140618_071704_835972_BAB765F1 X-CRM114-Status: GOOD ( 12.84 ) X-Spam-Score: -2.7 (--) Cc: Mark Rutland , Russell King , Mathias Nyman , Pawel Moll , Ian Campbell , Andrew Bresticker , Greg Kroah-Hartman , Linus Walleij , Randy Dunlap , Kishon Vijay Abraham I , Grant Likely , Rob Herring , Thierry Reding , Kumar Gala , Stephen Warren , Alan Stern , 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=-1.9 required=5.0 tests=BAYES_00, 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 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 --- arch/arm/boot/dts/tegra124-jetson-tk1.dts | 43 ++++++++++++++++--------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts index 11c1650..cea2d2b 100644 --- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts +++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts @@ -1619,15 +1619,35 @@ 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"; + s1p05v-supply = <&vdd_1v05_run>; + s3p3v-supply = <&vdd_3v3_lp0>; + s1p8v-supply = <&vddio_1v8>; + }; + padctl@0,7009f000 { pinctrl-0 = <&padctl_default>; pinctrl-names = "default"; + vbus-otg-2-supply = <&vdd_usb3_vbus>; + padctl_default: pinmux { - usb3 { - nvidia,lanes = "pcie-0", "pcie-1"; + otg { + nvidia,lanes = "otg-1", "otg-2"; + nvidia,function = "xusb"; + }; + + usb3p0 { + nvidia,lanes = "pcie-0"; nvidia,function = "usb3"; nvidia,iddq = <0>; + nvidia,usb3-port-num = <0>; + nvidia,usb2-port-num = <2>; }; pcie { @@ -1668,25 +1688,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>;