[U-Boot] [PATCH 2/4] apalis/colibri_t30: fix MMC/SD card detect GPIOs

[Stefan Agner]

On 17.02.2015 15:28, Marcel Ziswiler wrote:
> This fixes the MMC/SD card detect GPIOs for Apalis T30 which got broken
> by the following commit:
>
> 2b2b50bc8748bf1ddb2d96da7157f9eecbe24961
>
> While at it also re-add the comments describing which particular
> Apalis/Colibri pins those GPIOs are on.

Acked-by: Stefan Agner <stefan.agner at toradex.com>

>
> Signed-off-by: Marcel Ziswiler <marcel at ziswiler.com>
> ---
>  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 at 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 at 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 at 78000600 {
> @@ -266,12 +268,14 @@
>  	usb at 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 at 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 at 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 at 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 at 78000600 {
> @@ -83,12 +83,14 @@
>  	usb at 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 at 7d008000 {
>  		status = "okay";
> +		/* USBH_PEN */
>  		nvidia,vbus-gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;
>  	};
>  };