mmc: sdhci: convert reset into a library function

Rather than having platform_reset_enter/platform_reset_exit methods,
turn the core of the reset handling into a library function which
platforms can call at the appropriate moment in their (new) reset
method.

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 0e4ba0a4cd71b276281ebac68c4dec813c45c497..aca84a6825519d094f0efa2dbc8ad6c4f406742d 100644 (file)
--- a/drivers/mmc/host/sdhci-acpi.c
+++ b/drivers/mmc/host/sdhci-acpi.c
@@ -104,11 +104,13 @@ 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,
+       .reset = sdhci_reset,
 };
 
 static const struct sdhci_ops sdhci_acpi_ops_int = {
        .enable_dma = sdhci_acpi_enable_dma,
        .set_bus_width = sdhci_set_bus_width,
+       .reset = sdhci_reset,
        .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 06cdb8abb25e07fad82a532d9297d0ae35b9fca0..7b97bfab910d3196f66c2264f7454344985a10a2 100644 (file)
--- a/drivers/mmc/host/sdhci-bcm-kona.c
+++ b/drivers/mmc/host/sdhci-bcm-kona.c
@@ -210,6 +210,7 @@ static struct sdhci_ops sdhci_bcm_kona_ops = {
        .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,
+       .reset = sdhci_reset,
        .card_event = sdhci_bcm_kona_card_event,
 };
 

diff --git a/drivers/mmc/host/sdhci-bcm2835.c b/drivers/mmc/host/sdhci-bcm2835.c
index 7ab69af979b4dd74efe447eba734635e760e31d1..289b1c80d5fc43a2814e5e30c283e65df039db0f 100644 (file)
--- a/drivers/mmc/host/sdhci-bcm2835.c
+++ b/drivers/mmc/host/sdhci-bcm2835.c
@@ -134,6 +134,7 @@ static const struct sdhci_ops bcm2835_sdhci_ops = {
        .get_max_clock = sdhci_pltfm_clk_get_max_clock,
        .get_min_clock = bcm2835_sdhci_get_min_clock,
        .set_bus_width = sdhci_set_bus_width,
+       .reset = sdhci_reset,
 };
 
 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