From patchwork Sun Mar 1 01:05:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 444814 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 EBD2F1400D5 for ; Mon, 2 Mar 2015 07:20:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 948884B7E3; Sun, 1 Mar 2015 21:17:46 +0100 (CET) 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 8ORablq13dli; Sun, 1 Mar 2015 21:17:46 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 805424B792; Sun, 1 Mar 2015 21:16:12 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C015A4B150 for ; Sun, 1 Mar 2015 06:27:25 +0100 (CET) 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 Nb7Cj_20Q9JK for ; Sun, 1 Mar 2015 06:27:25 +0100 (CET) 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 271554A01F for ; Sun, 1 Mar 2015 06:27:20 +0100 (CET) Received: from localhost.net (190.191.5.85.dynamic.wline.res.cust.swisscom.ch [85.5.191.190]) by mrelay.perfora.net (node=mreueus001) with ESMTP (Nemesis) id 0M0SMt-1XejEA15FV-00uZyv; Sun, 01 Mar 2015 02:06:51 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Sun, 1 Mar 2015 02:05:37 +0100 Message-Id: <028633bfffce6fe15e239b95ff247caaa1e7b3fd.1425170569.git.marcel@ziswiler.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: References: X-Provags-ID: V02:K0:11Hh9cgnFp0SmGYXj2qtmCsR08jQS8CckaBjJjL2DcX xx7W9xn05XlJ32Wu/L3pZ53VMm4JWB/rc/t5tf96B1hfnBIUR3 bMohcCZNswL8fM2ZUfK6yAR+jVh3JgKzmExbJgSMCd4VBpUV7k t5KYzj4w/K2IEjjAvTHNoK3yEkCrcqt3jWw54b4QV65XEr7/B6 doqUiZUop7B3+Jb6iYnTreZipPdYbhCe1MIY/vInsijO90jcby lzGX3kWAc1l8jceAFILqTqlkEktUncqDR5bMqRaF84B3Vdpies HMlurx7WgpL3lmzNmZZKNJ1W+B9P1hi0KorclWM1OwJGmrNAmI VngKbT6KRBMjgp+hZ+0x3W62UwVkvfI9kwn2Bcq+PUXW3SCEBD 4T6vmwns4MkVbkyrIdsHjCwX1kJ+85lqACeiZf4s1W3GYYG7cf CLJTV X-UI-Out-Filterresults: notjunk:1; Cc: Stephen Warren , Stefan Agner , Marcel Ziswiler , Tom Warren , Marcel Ziswiler Subject: [U-Boot] [PATCH v2 2/4] apalis/colibri_t30: fix MMC/SD card detect GPIOs 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" This fixes the MMC/SD card detect GPIOs for Apalis T30 which got broken by the following commit: 2b2b50bc8748 "dm: tegra: dts: Use TEGRA_GPIO() macro for all GPIOs" While at it also re-add the comments describing which particular Apalis/Colibri pins those GPIOs are on. Signed-off-by: Marcel Ziswiler Reviewed-by: Simon Glass Acked-by: Stefan Agner --- Changes in v2: - Include commit subject too when referencing a previous commit as suggested by Stephen arch/arm/dts/tegra30-apalis.dts | 9 +++++++-- arch/arm/dts/tegra30-colibri.dts | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/arm/dts/tegra30-apalis.dts b/arch/arm/dts/tegra30-apalis.dts index 75c5d5f..13ab42b 100644 --- a/arch/arm/dts/tegra30-apalis.dts +++ b/arch/arm/dts/tegra30-apalis.dts @@ -247,13 +247,15 @@ sdhci@78000000 { status = "okay"; bus-width = <4>; - cd-gpios = <&gpio TEGRA_GPIO(CC, 5) GPIO_ACTIVE_HIGH>; + /* SD1_CD# */ + cd-gpios = <&gpio TEGRA_GPIO(CC, 5) GPIO_ACTIVE_LOW>; }; sdhci@78000400 { status = "okay"; bus-width = <8>; - cd-gpios = <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_HIGH>; + /* MMC1_CD# */ + cd-gpios = <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_LOW>; }; sdhci@78000600 { @@ -266,12 +268,14 @@ usb@7d000000 { status = "okay"; dr_mode = "peripheral"; + /* USBO1_EN */ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(T, 5) GPIO_ACTIVE_HIGH>; }; /* EHCI instance 1: USB2_DP/N -> USBH2_DP/N */ usb@7d004000 { status = "okay"; + /* USBH_EN */ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(DD, 1) GPIO_ACTIVE_HIGH>; phy_type = "utmi"; }; @@ -279,6 +283,7 @@ /* EHCI instance 2: USB3_DP/N -> USBH3_DP/N */ usb@7d008000 { status = "okay"; + /* USBH_EN */ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(DD, 1) GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm/dts/tegra30-colibri.dts b/arch/arm/dts/tegra30-colibri.dts index 6cd1902..36533dc 100644 --- a/arch/arm/dts/tegra30-colibri.dts +++ b/arch/arm/dts/tegra30-colibri.dts @@ -64,7 +64,7 @@ sdhci@78000200 { status = "okay"; bus-width = <4>; - cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; + cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; /* MMCD */ }; sdhci@78000600 { @@ -83,12 +83,14 @@ usb@7d004000 { status = "okay"; phy_type = "utmi"; + /* VBUS_LAN */ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(DD, 2) GPIO_ACTIVE_HIGH>; }; /* EHCI instance 2: USB3_DP/N -> USBH_P/N */ usb@7d008000 { status = "okay"; + /* USBH_PEN */ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>; }; };