From patchwork Thu Sep 15 07:27:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 670238 X-Patchwork-Delegate: twarren@nvidia.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3sZVQ068x1z9s3T for ; Thu, 15 Sep 2016 17:28:24 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7237CA7580; Thu, 15 Sep 2016 09:28:22 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wzAfr2-RoEAB; Thu, 15 Sep 2016 09:28:22 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 433F7A75AB; Thu, 15 Sep 2016 09:28:15 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9218EA7535 for ; Thu, 15 Sep 2016 09:28:00 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HZIYGBKewVwK for ; Thu, 15 Sep 2016 09:28:00 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by theia.denx.de (Postfix) with ESMTPS id 372F2A7537 for ; Thu, 15 Sep 2016 09:27:53 +0200 (CEST) Received: from marcel-pc.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus001) with ESMTPA (Nemesis) id 0MHF2L-1boc4I01oJ-00E2Eq; Thu, 15 Sep 2016 09:27:45 +0200 From: Marcel Ziswiler To: Stephen Warren , u-boot@lists.denx.de Date: Thu, 15 Sep 2016 09:27:24 +0200 Message-Id: <1473924445-14456-6-git-send-email-marcel.ziswiler@toradex.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1473924445-14456-1-git-send-email-marcel.ziswiler@toradex.com> References: <1473924445-14456-1-git-send-email-marcel.ziswiler@toradex.com> X-Provags-ID: V03:K0:HnVjuH5OWniOxWr2ooFJsCAz0P1sXF0iotl4ckW52WXTx8ONQbT 7GOx8gPkl2+0/p3/Jg6ZKd0opOWpKAGPbFYiZM7K7oIz+HrbMQKih1+JSa6WdYCm0fQNPVM RnkdNrXSGdkqChc8MZFtgtuTPKi2PD1xTrX3Aug2J2jW79QMRDPyIhpX/s4I9NN29UY0xiX IR1qP0WJDTAH4PDim9ifA== X-UI-Out-Filterresults: notjunk:1; V01:K0:MXUWa0xmNcQ=:KNmHEL3UDH+hYfQgEpogGr YRFnVJ9nC9/nYCIoeNug+7iwyZBgueo8cwaW5c1r//Y8ZS45iyL9CUVJme6eWWEceyJVf6UKJ vFt3R2tQDtjmConfrGPbjqgcrL4L9x1yzUpWUoH7mEaW3GcTKLDvM5R2vmVuHjmFchtFNU6HD q0D4MDCqxjgkYs/SzZNlKpT9tRiDnqxndcxK8RIbpLvNB8dEm9kxAIA8Z0qqWVEv5iXyv9wqR dMW7lrV9yuCKTfiWEi/CSnaD2nGzWaBiWKbtqPsNHm99dsndKPKtmMWZJS+5xhadH/xdIRhk4 WCTZEpdxXRVmPjUb/iRhlmbKsroRzTCWkUDclu3sB2LBnuoXLx1+1/FJkCGEkHMkpxxTLU+Ee p+D/BDnlAWsokJsgtTXpXW/Zui17PcCxIZO85aSes7RN1cYDWBkVld1xGZGDf9fkPAE+U/aM7 h0+Qaazpf2304SC/szOpt39xdVWA/piEZrhxIrHrJ2Ndal/Qb+dxbFMjs2lPq38w8rq0ciSXJ spdN1Bcs8FSzdyUwxx7eVE8PL1lqSVQSESgUNFz6STDLcADaeuZXA0w/0SH7ZLYZMvfqrYivi jeVNN0dfb4h24T+DJsxWPuD02cFTaxuAiIE6xgkA4oxzT7icsQFj7LqQt8pQHXEoDXHymJ07F O/NNGBb6nt3wYa80gNhot041tSQ5KwZaggW4rgIFoZ7eOfHPFR1nHRieY4bRBMLcOYfI= Cc: Lucas Stach , Marcel Ziswiler , Tom Warren Subject: [U-Boot] [PATCH v3 5/5] colibri_t20: fix usb operation and controller order X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Without this patch the following error will be shown: Colibri T20 # usb start starting USB... No controllers found This patch fixes USB operation and also the controller order as the CI UDC driver may only be instantiated on the first aka OTG port. Signed-off-by: Marcel Ziswiler Acked-by: Stephen Warren --- Changes in v3: - Add Stephen's ack. Changes in v2: - No change. - As suggested by Stephen remove last patch 5/5 colibri_t20: enable dfu also for nand. arch/arm/dts/tegra20-colibri.dts | 45 +++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/arch/arm/dts/tegra20-colibri.dts b/arch/arm/dts/tegra20-colibri.dts index 5b803d9..6bc8c49 100644 --- a/arch/arm/dts/tegra20-colibri.dts +++ b/arch/arm/dts/tegra20-colibri.dts @@ -14,10 +14,10 @@ i2c0 = "/i2c@7000d000"; i2c1 = "/i2c@7000c000"; i2c2 = "/i2c@7000c400"; - usb0 = "/usb@c5008000"; - usb1 = "/usb@c5000000"; - usb2 = "/usb@c5004000"; sdhci0 = "/sdhci@c8000600"; + usb0 = "/usb@c5000000"; + usb1 = "/usb@c5004000"; /* on-module only, for ASIX */ + usb2 = "/usb@c5008000"; }; host1x@50000000 { @@ -43,24 +43,6 @@ }; }; - usb@c5000000 { - statuc = "okay"; - dr_mode = "otg"; - }; - - usb@c5004000 { - statuc = "okay"; - /* VBUS_LAN */ - nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_HIGH>; - nvidia,vbus-gpio = <&gpio TEGRA_GPIO(BB, 1) GPIO_ACTIVE_HIGH>; - }; - - usb@c5008000 { - statuc = "okay"; - /* USBH_PEN */ - nvidia,vbus-gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>; - }; - nand-controller@70008000 { nvidia,wp-gpios = <&gpio TEGRA_GPIO(S, 0) GPIO_ACTIVE_HIGH>; nvidia,width = <8>; @@ -101,6 +83,27 @@ clock-frequency = <100000>; }; + /* EHCI instance 0: USB1_DP/N -> USBC_P/N */ + usb@c5000000 { + status = "okay"; + dr_mode = "otg"; + }; + + /* EHCI instance 1: ULPI -> USB3340 -> AX88772B */ + usb@c5004000 { + status = "okay"; + /* VBUS_LAN */ + nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_HIGH>; + nvidia,vbus-gpio = <&gpio TEGRA_GPIO(BB, 1) GPIO_ACTIVE_HIGH>; + }; + + /* EHCI instance 2: USB3_DP/N -> USBH_P/N */ + usb@c5008000 { + status = "okay"; + /* USBH_PEN */ + nvidia,vbus-gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>; + }; + sdhci@c8000600 { status = "okay"; bus-width = <4>;