diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 22:20:40 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 22:20:40 +0200 |
| commit | ebaaa25de8376292b2dfc8252f5213e3a28bac70 (patch) | |
| tree | 66cbb83e0dc63ccf090e5bb86c7d30927a5fa741 /drivers | |
| parent | 6887a4131da3adaab011613776d865f4bcfb5678 (diff) | |
| parent | 702b0e4f2f2782962aab7d9a0a40ad68770bb1f6 (diff) | |
| download | linux-ebaaa25de8376292b2dfc8252f5213e3a28bac70.tar.gz linux-ebaaa25de8376292b2dfc8252f5213e3a28bac70.tar.bz2 linux-ebaaa25de8376292b2dfc8252f5213e3a28bac70.zip | |
Merge branch 'tegra/cleanup' into next/clk
Dependency for tegra/common-clk branch
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/amba/tegra-ahb.c | 6 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci-tegra.c | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/drivers/amba/tegra-ahb.c b/drivers/amba/tegra-ahb.c index aa0b1f160528..0b6f0b28a487 100644 --- a/drivers/amba/tegra-ahb.c +++ b/drivers/amba/tegra-ahb.c @@ -264,11 +264,6 @@ static int __devinit tegra_ahb_probe(struct platform_device *pdev) return 0; } -static int __devexit tegra_ahb_remove(struct platform_device *pdev) -{ - return 0; -} - static const struct of_device_id tegra_ahb_of_match[] __devinitconst = { { .compatible = "nvidia,tegra30-ahb", }, { .compatible = "nvidia,tegra20-ahb", }, @@ -277,7 +272,6 @@ static const struct of_device_id tegra_ahb_of_match[] __devinitconst = { static struct platform_driver tegra_ahb_driver = { .probe = tegra_ahb_probe, - .remove = __devexit_p(tegra_ahb_remove), .driver = { .name = DRV_NAME, .owner = THIS_MODULE, 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; |