mmc-omap: Clean up omap set_ios and make MMC_POWER_ON work
Move divisor calculation into a separate function and re-arrange the init order to make MMC_POWER_ON work. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
This commit is contained in:
parent
46a6730e3f
commit
d3af5abe9a
|
@ -936,33 +936,41 @@ static void mmc_omap_power(struct mmc_omap_host *host, int on)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int mmc_omap_calc_divisor(struct mmc_host *mmc, struct mmc_ios *ios)
|
||||||
|
{
|
||||||
|
struct mmc_omap_host *host = mmc_priv(mmc);
|
||||||
|
int func_clk_rate = clk_get_rate(host->fclk);
|
||||||
|
int dsor;
|
||||||
|
|
||||||
|
if (ios->clock == 0)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
dsor = func_clk_rate / ios->clock;
|
||||||
|
if (dsor < 1)
|
||||||
|
dsor = 1;
|
||||||
|
|
||||||
|
if (func_clk_rate / dsor > ios->clock)
|
||||||
|
dsor++;
|
||||||
|
|
||||||
|
if (dsor > 250)
|
||||||
|
dsor = 250;
|
||||||
|
dsor++;
|
||||||
|
|
||||||
|
if (ios->bus_width == MMC_BUS_WIDTH_4)
|
||||||
|
dsor |= 1 << 15;
|
||||||
|
|
||||||
|
return dsor;
|
||||||
|
}
|
||||||
|
|
||||||
static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
|
static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
|
||||||
{
|
{
|
||||||
struct mmc_omap_host *host = mmc_priv(mmc);
|
struct mmc_omap_host *host = mmc_priv(mmc);
|
||||||
int dsor;
|
int dsor;
|
||||||
int realclock, i;
|
int i;
|
||||||
|
|
||||||
realclock = ios->clock;
|
dsor = mmc_omap_calc_divisor(mmc, ios);
|
||||||
|
host->bus_mode = ios->bus_mode;
|
||||||
if (ios->clock == 0)
|
host->hw_bus_mode = host->bus_mode;
|
||||||
dsor = 0;
|
|
||||||
else {
|
|
||||||
int func_clk_rate = clk_get_rate(host->fclk);
|
|
||||||
|
|
||||||
dsor = func_clk_rate / realclock;
|
|
||||||
if (dsor < 1)
|
|
||||||
dsor = 1;
|
|
||||||
|
|
||||||
if (func_clk_rate / dsor > realclock)
|
|
||||||
dsor++;
|
|
||||||
|
|
||||||
if (dsor > 250)
|
|
||||||
dsor = 250;
|
|
||||||
dsor++;
|
|
||||||
|
|
||||||
if (ios->bus_width == MMC_BUS_WIDTH_4)
|
|
||||||
dsor |= 1 << 15;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (ios->power_mode) {
|
switch (ios->power_mode) {
|
||||||
case MMC_POWER_OFF:
|
case MMC_POWER_OFF:
|
||||||
|
@ -977,9 +985,6 @@ static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
host->bus_mode = ios->bus_mode;
|
|
||||||
host->hw_bus_mode = host->bus_mode;
|
|
||||||
|
|
||||||
clk_enable(host->fclk);
|
clk_enable(host->fclk);
|
||||||
|
|
||||||
/* On insanely high arm_per frequencies something sometimes
|
/* On insanely high arm_per frequencies something sometimes
|
||||||
|
|
Loading…
Reference in New Issue