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

Commit 96d7b78c authored by Russell King's avatar Russell King Committed by Chris Ball
Browse files

mmc: sdhci: convert sdhci_set_uhs_signaling() into a library function 



Add sdhci_set_uhs_signaling() and always call the set_uhs_signaling
method.  This avoids quirks being added into sdhci_set_uhs_signaling().

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>
[Ulf Hansson] Resolved conflict
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarChris Ball <chris@printf.net>
parent 13e64501

drivers/mmc/host/sdhci-acpi.c

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

	.set_uhs_signaling = sdhci_set_uhs_signaling,

};



static const struct sdhci_ops sdhci_acpi_ops_int = {
@@ -113,6 +114,7 @@ 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,

	.set_uhs_signaling = sdhci_set_uhs_signaling,

	.hw_reset   = sdhci_acpi_int_hw_reset,

};

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

+1 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ static struct sdhci_ops sdhci_bcm_kona_ops = { 
	.platform_send_init_74_clocks = sdhci_bcm_kona_init_74_clocks,

	.set_bus_width = sdhci_set_bus_width,

	.reset = sdhci_reset,

	.set_uhs_signaling = sdhci_set_uhs_signaling,

	.card_event = sdhci_bcm_kona_card_event,

};

drivers/mmc/host/sdhci-bcm2835.c

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ static const struct sdhci_ops bcm2835_sdhci_ops = { 
	.get_min_clock = bcm2835_sdhci_get_min_clock,

	.set_bus_width = sdhci_set_bus_width,

	.reset = sdhci_reset,

	.set_uhs_signaling = sdhci_set_uhs_signaling,

};



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
@@ -81,6 +81,7 @@ static const struct sdhci_ops sdhci_cns3xxx_ops = { 
	.set_clock	= sdhci_cns3xxx_set_clock,

	.set_bus_width	= sdhci_set_bus_width,

	.reset          = sdhci_reset,

	.set_uhs_signaling = sdhci_set_uhs_signaling,

};



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
@@ -89,6 +89,7 @@ static const struct sdhci_ops sdhci_dove_ops = { 
	.set_clock = sdhci_set_clock,

	.set_bus_width = sdhci_set_bus_width,

	.reset = sdhci_reset,

	.set_uhs_signaling = sdhci_set_uhs_signaling,

};



static const struct sdhci_pltfm_data sdhci_dove_pdata = {