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

Commit 9bb09a30 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Ulf Hansson
Browse files

mmc: sh_mmcif: separate sh_mmcif_clk_update() into setup and prepare 



Current sh_mmcif_clk_update() is called from probe() and set_ios(),
but, the purpose of later one is just clk_prepare_enable().
No need to setup mmc->f_max/f_min in many times.
This patch separe sh_mmcif_clk_update() into clk_prepare_enable()
and mmc->f_max/f_min setup.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: default avatarKeita Kobayashi <keita.kobayashi.ym@renesas.com>
Acked-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 6aed678b

drivers/mmc/host/sh_mmcif.c

+10 −12
Original line number Diff line number Diff line
@@ -978,20 +978,14 @@ static void sh_mmcif_request(struct mmc_host *mmc, struct mmc_request *mrq) 
	sh_mmcif_start_cmd(host, mrq);

}



static int sh_mmcif_clk_update(struct sh_mmcif_host *host)

static void sh_mmcif_clk_setup(struct sh_mmcif_host *host)

{

	int ret = clk_prepare_enable(host->clk);



	if (!ret) {

	unsigned int clk = clk_get_rate(host->clk);



	host->mmc->f_max = clk / 2;

	host->mmc->f_min = clk / 512;

}



	return ret;

}



static void sh_mmcif_set_power(struct sh_mmcif_host *host, struct mmc_ios *ios)

{

	struct mmc_host *mmc = host->mmc;
@@ -1046,7 +1040,8 @@ static void sh_mmcif_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 


	if (ios->clock) {

		if (!host->power) {

			sh_mmcif_clk_update(host);

			clk_prepare_enable(host->clk);



			pm_runtime_get_sync(&host->pd->dev);

			host->power = true;

			sh_mmcif_sync_reset(host);
@@ -1447,10 +1442,13 @@ static int sh_mmcif_probe(struct platform_device *pdev) 
		dev_err(dev, "cannot get clock: %d\n", ret);

		goto err_pm;

	}

	ret = sh_mmcif_clk_update(host);



	ret = clk_prepare_enable(host->clk);

	if (ret < 0)

		goto err_pm;



	sh_mmcif_clk_setup(host);



	ret = pm_runtime_resume(dev);

	if (ret < 0)

		goto err_clk;