Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03231f9b authored by Russell King's avatar Russell King Committed by Chris Ball
Browse files

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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Tested-by: default avatarMarkus Pargmann <mpa@pengutronix.de>
Tested-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarChris Ball <chris@printf.net>
parent 2317f56c

drivers/mmc/host/sdhci-acpi.c

+2 −0
Original line number Diff line number Diff line
@@ -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,

};

drivers/mmc/host/sdhci-bcm-kona.c

+1 −0
Original line number Diff line number Diff line
@@ -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,

};

drivers/mmc/host/sdhci-bcm2835.c

+1 −0
Original line number Diff line number Diff line
@@ -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 = {

drivers/mmc/host/sdhci-cns3xxx.c

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ static const struct sdhci_ops sdhci_cns3xxx_ops = { 
	.get_max_clock	= sdhci_cns3xxx_get_max_clk,

	.set_clock	= sdhci_cns3xxx_set_clock,

	.set_bus_width	= sdhci_set_bus_width,

	.reset          = sdhci_reset,

};



static const struct sdhci_pltfm_data sdhci_cns3xxx_pdata = {

drivers/mmc/host/sdhci-dove.c

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ static const struct sdhci_ops sdhci_dove_ops = { 
	.read_w	= sdhci_dove_readw,

	.read_l	= sdhci_dove_readl,

	.set_bus_width = sdhci_set_bus_width,

	.reset = sdhci_reset,

};



static const struct sdhci_pltfm_data sdhci_dove_pdata = {