mmc: sdhci: convert generic bus width setup to library function

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Tested-by: Markus Pargmann <mpa@pengutronix.de>
Tested-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <chris@printf.net>

diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
index ebb3f392b5894f6af8705604a38476b4e0048aa3..0e4ba0a4cd71b276281ebac68c4dec813c45c497 100644 (file)
--- a/drivers/mmc/host/sdhci-acpi.c
+++ b/drivers/mmc/host/sdhci-acpi.c
@@ -103,10 +103,12 @@ static void sdhci_acpi_int_hw_reset(struct sdhci_host *host)
 
 static const struct sdhci_ops sdhci_acpi_ops_dflt = {
        .enable_dma = sdhci_acpi_enable_dma,
+       .set_bus_width = sdhci_set_bus_width,
 };
 
 static const struct sdhci_ops sdhci_acpi_ops_int = {
        .enable_dma = sdhci_acpi_enable_dma,
+       .set_bus_width = sdhci_set_bus_width,
        .hw_reset   = sdhci_acpi_int_hw_reset,
 };
 

diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c
index 6f166e63b8172fd5484796584cb36c8291410aeb..06cdb8abb25e07fad82a532d9297d0ae35b9fca0 100644 (file)
--- a/drivers/mmc/host/sdhci-bcm-kona.c
+++ b/drivers/mmc/host/sdhci-bcm-kona.c
@@ -209,6 +209,7 @@ static struct sdhci_ops sdhci_bcm_kona_ops = {
        .get_max_clock = sdhci_bcm_kona_get_max_clk,
        .get_timeout_clock = sdhci_bcm_kona_get_timeout_clock,
        .platform_send_init_74_clocks = sdhci_bcm_kona_init_74_clocks,
+       .set_bus_width = sdhci_set_bus_width,
        .card_event = sdhci_bcm_kona_card_event,
 };
 

diff --git a/drivers/mmc/host/sdhci-bcm2835.c b/drivers/mmc/host/sdhci-bcm2835.c
index f6d8d67c545f882678ea40bca4f2525a77bf28bf..7ab69af979b4dd74efe447eba734635e760e31d1 100644 (file)
--- a/drivers/mmc/host/sdhci-bcm2835.c
+++ b/drivers/mmc/host/sdhci-bcm2835.c
@@ -133,6 +133,7 @@ static const struct sdhci_ops bcm2835_sdhci_ops = {
        .read_b = bcm2835_sdhci_readb,
        .get_max_clock = sdhci_pltfm_clk_get_max_clock,
        .get_min_clock = bcm2835_sdhci_get_min_clock,
+       .set_bus_width = sdhci_set_bus_width,
 };
 
 static const struct sdhci_pltfm_data bcm2835_sdhci_pdata = {

diff --cc drivers/mmc/host/sdhci-cns3xxx.c
Simple merge

diff --cc drivers/mmc/host/sdhci-dove.c
Simple merge

diff --cc drivers/mmc/host/sdhci-esdhc-imx.c
Simple merge

diff --cc drivers/mmc/host/sdhci-of-arasan.c
Simple merge

diff --cc drivers/mmc/host/sdhci-of-esdhc.c
Simple merge

diff --cc drivers/mmc/host/sdhci-of-hlwd.c
Simple merge

diff --cc drivers/mmc/host/sdhci-pci.c
Simple merge

diff --cc drivers/mmc/host/sdhci-pltfm.c
Simple merge

diff --cc drivers/mmc/host/sdhci-pxav2.c
Simple merge

diff --cc drivers/mmc/host/sdhci-pxav3.c
Simple merge

diff --cc drivers/mmc/host/sdhci-s3c.c
Simple merge

diff --cc drivers/mmc/host/sdhci-sirf.c
Simple merge

diff --cc drivers/mmc/host/sdhci-spear.c
Simple merge

diff --cc drivers/mmc/host/sdhci-tegra.c
Simple merge

diff --cc drivers/mmc/host/sdhci.c
Simple merge

diff --cc drivers/mmc/host/sdhci.h
Simple merge