[PATCH REPOST 1/2] mmc: tegra: use bus-width property instead of support-8bit

Stephen Warren swarren at wwwdotorg.org
Mon Jun 4 14:32:34 EDT 2012

From: Stephen Warren <swarren at nvidia.com>

Update the driver to parse the new unified bus-width property introduced
in commit 7f21779 "mmc: dt: Consolidate DT bindings", instead of the legacy
support-8bit property.

Signed-off-by: Stephen Warren <swarren at nvidia.com>
Chris, It's probably easiest conflict-wise if I take this through the Tegra
tree. (Note: When I posted this series before, I said there shouldn't be any
conflicts if you take them through the MMC tree. That's probably still true,
but unforseen future conflicts seem more likely in the .dts files in the
second patch than sdhci-tegra.c in this patch, so the Tegra tree may make
more sense). Since the second patch depends on the first, it's easiest if
these go in through the same tree. Does this sound OK?

 drivers/mmc/host/sdhci-tegra.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index b38d8a7..6e5338a 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;

More information about the linux-arm-kernel mailing list