From cca1d1bdf6141d2f211bfed7c356a641a05c996b Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Tue, 30 Aug 2011 13:17:16 -0600
Subject: [PATCH] --- yaml --- r: 270258 b: refs/heads/master c:
 55cd65e48b62c6f08edbb93d5cadf96e876ebcc2 h: refs/heads/master v: v3

---
 [refs]                                                      | 2 +-
 .../Documentation/devicetree/bindings/mmc/nvidia-sdhci.txt  | 6 ++++--
 trunk/drivers/mmc/host/sdhci-tegra.c                        | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c6ce1e5136d9..79bfa505ef72 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a5c8e1f4f09e67118f81885a22ceb7bbd2df4ee
+refs/heads/master: 55cd65e48b62c6f08edbb93d5cadf96e876ebcc2
diff --git a/trunk/Documentation/devicetree/bindings/mmc/nvidia-sdhci.txt b/trunk/Documentation/devicetree/bindings/mmc/nvidia-sdhci.txt
index c87f66782726..7e51154679a6 100644
--- a/trunk/Documentation/devicetree/bindings/mmc/nvidia-sdhci.txt
+++ b/trunk/Documentation/devicetree/bindings/mmc/nvidia-sdhci.txt
@@ -5,13 +5,14 @@ and SDIO types of memory cards.
 
 Required properties:
 - compatible : Should be "nvidia,<chip>-sdhci"
-- reg : Should contain eSDHC registers location and length
-- interrupts : Should contain eSDHC interrupt
+- reg : Should contain SD/MMC registers location and length
+- interrupts : Should contain SD/MMC interrupt
 
 Optional properties:
 - cd-gpios : Specify GPIOs for card detection
 - wp-gpios : Specify GPIOs for write protection
 - power-gpios : Specify GPIOs for power control
+- support-8bit : Boolean, indicates if 8-bit mode should be used.
 
 Example:
 
@@ -22,4 +23,5 @@ sdhci@c8000200 {
 	cd-gpios = <&gpio 69 0>; /* gpio PI5 */
 	wp-gpios = <&gpio 57 0>; /* gpio PH1 */
 	power-gpios = <&gpio 155 0>; /* gpio PT3 */
+	support-8bit;
 };
diff --git a/trunk/drivers/mmc/host/sdhci-tegra.c b/trunk/drivers/mmc/host/sdhci-tegra.c
index 8a114b6211c7..d105b52bfec0 100644
--- a/trunk/drivers/mmc/host/sdhci-tegra.c
+++ b/trunk/drivers/mmc/host/sdhci-tegra.c
@@ -17,6 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <linux/io.h>
+#include <linux/of.h>
 #include <linux/of_gpio.h>
 #include <linux/gpio.h>
 #include <linux/mmc/card.h>
@@ -152,6 +153,8 @@ static struct tegra_sdhci_platform_data * __devinit sdhci_tegra_dt_parse_pdata(
 	plat->cd_gpio = of_get_named_gpio(np, "cd-gpios", 0);
 	plat->wp_gpio = of_get_named_gpio(np, "wp-gpios", 0);
 	plat->power_gpio = of_get_named_gpio(np, "power-gpios", 0);
+	if (of_find_property(np, "support-8bit", NULL))
+		plat->is_8bit = 1;
 
 	return plat;
 }