Commit 68f83127 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Ulf Hansson
Browse files

mmc: renesas_sdhi: merge clk_{start,stop} functions to set_clock 



renesas_sdhi_clk_start() and renesas_sdhi_clk_stop() are now only
called from renesas_sdhi_set_clock().  Merge them.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent b85c997d

drivers/mmc/host/renesas_sdhi_core.c

+12 −26
Original line number Diff line number Diff line
@@ -152,35 +152,17 @@ static unsigned int renesas_sdhi_clk_update(struct tmio_mmc_host *host, 
	return ret == 0 ? best_freq : clk_get_rate(priv->clk);

}



static void renesas_sdhi_clk_start(struct tmio_mmc_host *host)

static void renesas_sdhi_set_clock(struct tmio_mmc_host *host,

				   unsigned int new_clock)

{

	sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, CLK_CTL_SCLKEN |

		sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL));



	/* HW engineers overrode docs: no sleep needed on R-Car2+ */

	if (!(host->pdata->flags & TMIO_MMC_MIN_RCAR2))

		usleep_range(10000, 11000);

}

	u32 clk = 0, clock;



static void renesas_sdhi_clk_stop(struct tmio_mmc_host *host)

{

	sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, ~CLK_CTL_SCLKEN &

		sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL));



	/* HW engineers overrode docs: no sleep needed on R-Car2+ */

	if (!(host->pdata->flags & TMIO_MMC_MIN_RCAR2))

		usleep_range(10000, 11000);

}



static void renesas_sdhi_set_clock(struct tmio_mmc_host *host,

				   unsigned int new_clock)

{

	u32 clk = 0, clock;

	if (new_clock == 0)

		goto out;



	if (new_clock == 0) {

		renesas_sdhi_clk_stop(host);

		return;

	}

	/*

	 * Both HS400 and HS200/SD104 set 200MHz, but some devices need to

	 * set 400MHz to distinguish the CPG settings in HS400.
@@ -203,13 +185,17 @@ static void renesas_sdhi_set_clock(struct tmio_mmc_host *host, 
			clk &= ~0xff;

	}



	sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, ~CLK_CTL_SCLKEN &

			sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL));

	sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, clk & CLK_CTL_DIV_MASK);

	if (!(host->pdata->flags & TMIO_MMC_MIN_RCAR2))

		usleep_range(10000, 11000);



	renesas_sdhi_clk_start(host);

	sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, CLK_CTL_SCLKEN |

		sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL));



out:

	/* HW engineers overrode docs: no sleep needed on R-Car2+ */

	if (!(host->pdata->flags & TMIO_MMC_MIN_RCAR2))

		usleep_range(10000, 11000);

}



static void renesas_sdhi_clk_disable(struct tmio_mmc_host *host)

CRA Git | Maintained and supported by SUSTech CRA and CCSE