Merge branch 'tegra/cleanup' into next/clk

Dependency for tegra/common-clk branch

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index b38d8a78f6a0..6e5338a071ce 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -223,6 +223,7 @@ static struct tegra_sdhci_platform_data * __devinit sdhci_tegra_dt_parse_pdata(
 {
         struct tegra_sdhci_platform_data *plat;
         struct device_node *np = pdev->dev.of_node;
+        u32 bus_width;
 
         if (!np)
                 return NULL;
@@ -236,7 +237,9 @@ 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))
+
+        if (of_property_read_u32(np, "bus-width", &bus_width) == 0 &&
+            bus_width == 8)
                 plat->is_8bit = 1;
 
         return plat;