| Message ID | 1338834755-6900-1-git-send-email-swarren@wwwdotorg.org |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Mon, Jun 04, 2012 at 12:32:34PM -0600, Stephen Warren wrote: > From: Stephen Warren <swarren@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@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? Yes, makes sense -- taking this via the Tegra tree is fine: Acked-by: Chris Ball <cjb@laptop.org> Thanks! - Chris.
On 06/06/2012 07:56 AM, Chris Ball wrote: > On Mon, Jun 04, 2012 at 12:32:34PM -0600, Stephen Warren wrote: >> From: Stephen Warren <swarren@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@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? > > Yes, makes sense -- taking this via the Tegra tree is fine: > > Acked-by: Chris Ball <cjb@laptop.org> Thanks. I have applied the series. -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;