p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mmc: sunxi: Factor out clock phase setting code into a helper function 

Add a sunxi_mmc_clk_set_phase() helper function.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Hans de Goede 2016-07-30 16:25:46 +02:00 committed by Ulf Hansson
parent 86a93317ed
commit f2cecb7094
1 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
drivers/mmc/host/sunxi-mmc.c
View File

@ -657,12 +657,39 @@ static int sunxi_mmc_oclk_onoff(struct sunxi_mmc_host *host, u32 oclk_en)
return 0; return 0;
} }
static int sunxi_mmc_clk_set_phase(struct sunxi_mmc_host *host,
struct mmc_ios *ios, u32 rate)
{
int index;
/* determine delays */
if (rate <= 400000) {
index = SDXC_CLK_400K;
} else if (rate <= 25000000) {
index = SDXC_CLK_25M;
} else if (rate <= 52000000) {
if (ios->timing != MMC_TIMING_UHS_DDR50 &&
ios->timing != MMC_TIMING_MMC_DDR52) {
index = SDXC_CLK_50M;
} else if (ios->bus_width == MMC_BUS_WIDTH_8) {
index = SDXC_CLK_50M_DDR_8BIT;
} else {
index = SDXC_CLK_50M_DDR;
}
} else {
return -EINVAL;
}
clk_set_phase(host->clk_sample, host->cfg->clk_delays[index].sample);
clk_set_phase(host->clk_output, host->cfg->clk_delays[index].output);
return 0;
}
static int sunxi_mmc_clk_set_rate(struct sunxi_mmc_host *host, static int sunxi_mmc_clk_set_rate(struct sunxi_mmc_host *host,
struct mmc_ios *ios) struct mmc_ios *ios)
{ {
const struct sunxi_mmc_clk_delay *clk_delays = host->cfg->clk_delays; u32 rate, rval, clock = ios->clock;
u32 rate, oclk_dly, rval, sclk_dly;
u32 clock = ios->clock;
int ret; int ret;
/* 8 bit DDR requires a higher module clock */ /* 8 bit DDR requires a higher module clock */
@ -697,31 +724,9 @@ static int sunxi_mmc_clk_set_rate(struct sunxi_mmc_host *host,
} }
mmc_writel(host, REG_CLKCR, rval); mmc_writel(host, REG_CLKCR, rval);
/* determine delays */ ret = sunxi_mmc_clk_set_phase(host, ios, rate);
if (rate <= 400000) { if (ret)
oclk_dly = clk_delays[SDXC_CLK_400K].output; return ret;
sclk_dly = clk_delays[SDXC_CLK_400K].sample;
} else if (rate <= 25000000) {
oclk_dly = clk_delays[SDXC_CLK_25M].output;
sclk_dly = clk_delays[SDXC_CLK_25M].sample;
} else if (rate <= 52000000) {
if (ios->timing != MMC_TIMING_UHS_DDR50 &&
ios->timing != MMC_TIMING_MMC_DDR52) {
oclk_dly = clk_delays[SDXC_CLK_50M].output;
sclk_dly = clk_delays[SDXC_CLK_50M].sample;
} else if (ios->bus_width == MMC_BUS_WIDTH_8) {
oclk_dly = clk_delays[SDXC_CLK_50M_DDR_8BIT].output;
sclk_dly = clk_delays[SDXC_CLK_50M_DDR_8BIT].sample;
} else {
oclk_dly = clk_delays[SDXC_CLK_50M_DDR].output;
sclk_dly = clk_delays[SDXC_CLK_50M_DDR].sample;
}
} else {
return -EINVAL;
}
clk_set_phase(host->clk_sample, sclk_dly);
clk_set_phase(host->clk_output, oclk_dly);
return sunxi_mmc_oclk_onoff(host, 1); return sunxi_mmc_oclk_onoff(host, 1);
} }