Commit 98160562 authored by Nicolas Saenz Julienne's avatar Nicolas Saenz Julienne Committed by Ulf Hansson
Browse files

mmc: sdhci: at91: Use sdhci_set_power_and_voltage() 



The sdhci core provides a helper function with the same functionality as
this controller's set_power() callback. Use it instead.

Signed-off-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20200306174413.20634-5-nsaenzjulienne@suse.de


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent d2abc6e2

drivers/mmc/host/sdhci-of-at91.c

+1 −17
Original line number Diff line number Diff line
@@ -101,22 +101,6 @@ static void sdhci_at91_set_clock(struct sdhci_host *host, unsigned int clock) 
	sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);

}



/*

 * In this specific implementation of the SDHCI controller, the power register

 * needs to have a valid voltage set even when the power supply is managed by

 * an external regulator.

 */

static void sdhci_at91_set_power(struct sdhci_host *host, unsigned char mode,

		     unsigned short vdd)

{

	if (!IS_ERR(host->mmc->supply.vmmc)) {

		struct mmc_host *mmc = host->mmc;



		mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);

	}

	sdhci_set_power_noreg(host, mode, vdd);

}



static void sdhci_at91_set_uhs_signaling(struct sdhci_host *host,

					 unsigned int timing)

{
@@ -146,7 +130,7 @@ static const struct sdhci_ops sdhci_at91_sama5d2_ops = { 
	.set_bus_width		= sdhci_set_bus_width,

	.reset			= sdhci_at91_reset,

	.set_uhs_signaling	= sdhci_at91_set_uhs_signaling,

	.set_power		= sdhci_at91_set_power,

	.set_power		= sdhci_set_power_and_bus_voltage,

};



static const struct sdhci_pltfm_data sdhci_sama5d2_pdata = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE