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

Commit ae12d250 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: tmio: Handle clock gating from runtime PM functions 



Add clock gating control as a part of the tmio library functions for
runtime PM.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
parent 3b292bb0

drivers/mmc/host/tmio_mmc.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -73,9 +73,10 @@ struct tmio_mmc_host { 
	struct delayed_work	delayed_reset_work;

	struct delayed_work	delayed_reset_work;

	struct work_struct	done;

	struct work_struct	done;





	/* Cache IRQ mask */

	/* Cache */

	u32			sdcard_irq_mask;

	u32			sdcard_irq_mask;

	u32			sdio_irq_mask;

	u32			sdio_irq_mask;

	unsigned int		clk_cache;





	spinlock_t		lock;		/* protect host private data */

	spinlock_t		lock;		/* protect host private data */

	unsigned long		last_req_ts;

	unsigned long		last_req_ts;

drivers/mmc/host/tmio_mmc_pio.c

+24 −4
Original line number Original line Diff line number Diff line
@@ -149,7 +149,8 @@ static void tmio_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable) 
	}

	}

}

}





static void tmio_mmc_set_clock(struct tmio_mmc_host *host, int new_clock)

static void tmio_mmc_set_clock(struct tmio_mmc_host *host,

				unsigned int new_clock)

{

{

	u32 clk = 0, clock;

	u32 clk = 0, clock;
@@ -767,9 +768,9 @@ static void tmio_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq) 
	pm_runtime_put_autosuspend(mmc_dev(mmc));

	pm_runtime_put_autosuspend(mmc_dev(mmc));

}

}





static int tmio_mmc_clk_update(struct mmc_host *mmc)

static int tmio_mmc_clk_update(struct tmio_mmc_host *host)

{

{

	struct tmio_mmc_host *host = mmc_priv(mmc);

	struct mmc_host *mmc = host->mmc;

	struct tmio_mmc_data *pdata = host->pdata;

	struct tmio_mmc_data *pdata = host->pdata;

	int ret;

	int ret;
@@ -911,6 +912,8 @@ static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
			ios->clock, ios->power_mode);

			ios->clock, ios->power_mode);

	host->mrq = NULL;

	host->mrq = NULL;





	host->clk_cache = ios->clock;



	mutex_unlock(&host->ios_lock);

	mutex_unlock(&host->ios_lock);





	pm_runtime_mark_last_busy(mmc_dev(mmc));

	pm_runtime_mark_last_busy(mmc_dev(mmc));
@@ -1036,7 +1039,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host **host, 
				  mmc->caps & MMC_CAP_NONREMOVABLE ||

				  mmc->caps & MMC_CAP_NONREMOVABLE ||

				  mmc->slot.cd_irq >= 0);

				  mmc->slot.cd_irq >= 0);





	if (tmio_mmc_clk_update(mmc) < 0) {

	if (tmio_mmc_clk_update(_host) < 0) {

		mmc->f_max = pdata->hclk;

		mmc->f_max = pdata->hclk;

		mmc->f_min = mmc->f_max / 512;

		mmc->f_min = mmc->f_max / 512;

	}

	}
@@ -1162,6 +1165,15 @@ EXPORT_SYMBOL(tmio_mmc_host_resume); 
#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM_RUNTIME

int tmio_mmc_host_runtime_suspend(struct device *dev)

int tmio_mmc_host_runtime_suspend(struct device *dev)

{

{

	struct mmc_host *mmc = dev_get_drvdata(dev);

	struct tmio_mmc_host *host = mmc_priv(mmc);



	if (host->clk_cache)

		tmio_mmc_clk_stop(host);



	if (host->pdata->clk_disable)

		host->pdata->clk_disable(host->pdev);



	return 0;

	return 0;

}

}

EXPORT_SYMBOL(tmio_mmc_host_runtime_suspend);

EXPORT_SYMBOL(tmio_mmc_host_runtime_suspend);
@@ -1171,6 +1183,14 @@ int tmio_mmc_host_runtime_resume(struct device *dev) 
	struct mmc_host *mmc = dev_get_drvdata(dev);

	struct mmc_host *mmc = dev_get_drvdata(dev);

	struct tmio_mmc_host *host = mmc_priv(mmc);

	struct tmio_mmc_host *host = mmc_priv(mmc);





	tmio_mmc_reset(host);

	tmio_mmc_clk_update(host);



	if (host->clk_cache) {

		tmio_mmc_set_clock(host, host->clk_cache);

		tmio_mmc_clk_start(host);

	}



	tmio_mmc_enable_dma(host, true);

	tmio_mmc_enable_dma(host, true);





	return 0;

	return 0;