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

Commit fec79673 authored by Ritesh Harjani's avatar Ritesh Harjani Committed by Ulf Hansson
Browse files

mmc: sdhci: Factor out sdhci_enable_clk 



Factor out sdhci_enable_clk from sdhci_set_clock
and make it EXPORT_SYMBOL so that it can be called.

Signed-off-by: default avatarRitesh Harjani <riteshh@codeaurora.org>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent a0e31428

drivers/mmc/host/sdhci.c

+17 −11
Original line number Diff line number Diff line
@@ -1344,20 +1344,10 @@ u16 sdhci_calc_clk(struct sdhci_host *host, unsigned int clock, 
}

EXPORT_SYMBOL_GPL(sdhci_calc_clk);



void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)

void sdhci_enable_clk(struct sdhci_host *host, u16 clk)

{

	u16 clk;

	unsigned long timeout;



	host->mmc->actual_clock = 0;



	sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);



	if (clock == 0)

		return;



	clk = sdhci_calc_clk(host, clock, &host->mmc->actual_clock);



	clk |= SDHCI_CLOCK_INT_EN;

	sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);
@@ -1378,6 +1368,22 @@ void sdhci_set_clock(struct sdhci_host *host, unsigned int clock) 
	clk |= SDHCI_CLOCK_CARD_EN;

	sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);

}

EXPORT_SYMBOL_GPL(sdhci_enable_clk);



void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)

{

	u16 clk;



	host->mmc->actual_clock = 0;



	sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);



	if (clock == 0)

		return;



	clk = sdhci_calc_clk(host, clock, &host->mmc->actual_clock);

	sdhci_enable_clk(host, clk);

}

EXPORT_SYMBOL_GPL(sdhci_set_clock);



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

drivers/mmc/host/sdhci.h

+1 −0
Original line number Diff line number Diff line
@@ -682,6 +682,7 @@ static inline bool sdhci_sdio_irq_enabled(struct sdhci_host *host) 
u16 sdhci_calc_clk(struct sdhci_host *host, unsigned int clock,

		   unsigned int *actual_clock);

void sdhci_set_clock(struct sdhci_host *host, unsigned int clock);

void sdhci_enable_clk(struct sdhci_host *host, u16 clk);

void sdhci_set_power(struct sdhci_host *host, unsigned char mode,

		     unsigned short vdd);

void sdhci_set_power_noreg(struct sdhci_host *host, unsigned char mode,