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

mmc: tmio: move clk_enable/disable out of tmio_mmc_host_probe() 



The clock is enabled in the tmio_mmc_host_probe().  It also prevents
drivers from performing platform-specific settings before mmc_add_host()
because the register access generally requires a clock.

Enable/disable the clock in drivers' probe/remove.  Also, I passed
tmio_mmc_data to tmio_mmc_host_alloc() because renesas_sdhi_clk_enable()
needs it to get the private data from tmio_mmc_host.

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

drivers/mmc/host/renesas_sdhi_core.c

+10 −3
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ int renesas_sdhi_probe(struct platform_device *pdev, 
						"state_uhs");

	}



	host = tmio_mmc_host_alloc(pdev);

	host = tmio_mmc_host_alloc(pdev, mmc_data);

	if (IS_ERR(host))

		return PTR_ERR(host);
@@ -571,10 +571,14 @@ int renesas_sdhi_probe(struct platform_device *pdev, 
	/* All SDHI have SDIO status bits which must be 1 */

	mmc_data->flags |= TMIO_MMC_SDIO_STATUS_SETBITS;



	ret = tmio_mmc_host_probe(host, mmc_data, dma_ops);

	if (ret < 0)

	ret = renesas_sdhi_clk_enable(host);

	if (ret)

		goto efree;



	ret = tmio_mmc_host_probe(host, dma_ops);

	if (ret < 0)

		goto edisclk;



	/* One Gen2 SDHI incarnation does NOT have a CBSY bit */

	if (sd_ctrl_read16(host, CTL_VERSION) == SDHI_VER_GEN2_SDR50)

		mmc_data->flags &= ~TMIO_MMC_HAVE_CBSY;
@@ -635,6 +639,8 @@ int renesas_sdhi_probe(struct platform_device *pdev, 


eirq:

	tmio_mmc_host_remove(host);

edisclk:

	renesas_sdhi_clk_disable(host);

efree:

	tmio_mmc_host_free(host);
@@ -647,6 +653,7 @@ int renesas_sdhi_remove(struct platform_device *pdev) 
	struct tmio_mmc_host *host = platform_get_drvdata(pdev);



	tmio_mmc_host_remove(host);

	renesas_sdhi_clk_disable(host);



	return 0;

}

drivers/mmc/host/tmio_mmc.c

+5 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static int tmio_mmc_probe(struct platform_device *pdev) 


	pdata->flags |= TMIO_MMC_HAVE_HIGH_REG;



	host = tmio_mmc_host_alloc(pdev);

	host = tmio_mmc_host_alloc(pdev, pdata);

	if (IS_ERR(host)) {

		ret = PTR_ERR(host);

		goto cell_disable;
@@ -101,7 +101,10 @@ static int tmio_mmc_probe(struct platform_device *pdev) 
	/* SD control register space size is 0x200, 0x400 for bus_shift=1 */

	host->bus_shift = resource_size(res) >> 10;



	ret = tmio_mmc_host_probe(host, pdata, NULL);

	host->mmc->f_max = pdata->hclk;

	host->mmc->f_min = pdata->hclk / 512;



	ret = tmio_mmc_host_probe(host, NULL);

	if (ret)

		goto host_free;

drivers/mmc/host/tmio_mmc.h

+2 −2
Original line number Diff line number Diff line
@@ -195,10 +195,10 @@ struct tmio_mmc_host { 
	const struct tmio_mmc_dma_ops *dma_ops;

};



struct tmio_mmc_host *tmio_mmc_host_alloc(struct platform_device *pdev);

struct tmio_mmc_host *tmio_mmc_host_alloc(struct platform_device *pdev,

					  struct tmio_mmc_data *pdata);

void tmio_mmc_host_free(struct tmio_mmc_host *host);

int tmio_mmc_host_probe(struct tmio_mmc_host *host,

			struct tmio_mmc_data *pdata,

			const struct tmio_mmc_dma_ops *dma_ops);

void tmio_mmc_host_remove(struct tmio_mmc_host *host);

void tmio_mmc_do_data_irq(struct tmio_mmc_host *host);

drivers/mmc/host/tmio_mmc_core.c

+13 −20
Original line number Diff line number Diff line
@@ -1145,8 +1145,8 @@ static void tmio_mmc_of_parse(struct platform_device *pdev, 
		pdata->flags |= TMIO_MMC_WRPROTECT_DISABLE;

}



struct tmio_mmc_host*

tmio_mmc_host_alloc(struct platform_device *pdev)

struct tmio_mmc_host *tmio_mmc_host_alloc(struct platform_device *pdev,

					  struct tmio_mmc_data *pdata)

{

	struct tmio_mmc_host *host;

	struct mmc_host *mmc;
@@ -1166,9 +1166,12 @@ tmio_mmc_host_alloc(struct platform_device *pdev) 
	host->ctl = ctl;

	host->mmc = mmc;

	host->pdev = pdev;

	host->pdata = pdata;

	host->ops = tmio_mmc_ops;

	mmc->ops = &host->ops;



	platform_set_drvdata(pdev, host);



	return host;

}

EXPORT_SYMBOL_GPL(tmio_mmc_host_alloc);
@@ -1180,14 +1183,21 @@ void tmio_mmc_host_free(struct tmio_mmc_host *host) 
EXPORT_SYMBOL_GPL(tmio_mmc_host_free);



int tmio_mmc_host_probe(struct tmio_mmc_host *_host,

			struct tmio_mmc_data *pdata,

			const struct tmio_mmc_dma_ops *dma_ops)

{

	struct platform_device *pdev = _host->pdev;

	struct tmio_mmc_data *pdata = _host->pdata;

	struct mmc_host *mmc = _host->mmc;

	int ret;

	u32 irq_mask = TMIO_MASK_CMD;



	/*

	 * Check the sanity of mmc->f_min to prevent tmio_mmc_set_clock() from

	 * looping forever...

	 */

	if (mmc->f_min == 0)

		return -EINVAL;



	tmio_mmc_of_parse(pdev, pdata);



	if (!(pdata->flags & TMIO_MMC_HAS_IDLE_WAIT))
@@ -1197,9 +1207,6 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, 
	if (ret < 0)

		return ret;



	_host->pdata = pdata;

	platform_set_drvdata(pdev, _host);



	_host->set_pwr = pdata->set_pwr;

	_host->set_clk_div = pdata->set_clk_div;
@@ -1247,18 +1254,6 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, 
	if (pdata->flags & TMIO_MMC_MIN_RCAR2)

		_host->native_hotplug = true;



	if (tmio_mmc_clk_enable(_host) < 0) {

		mmc->f_max = pdata->hclk;

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

	}



	/*

	 * Check the sanity of mmc->f_min to prevent tmio_mmc_set_clock() from

	 * looping forever...

	 */

	if (mmc->f_min == 0)

		return -EINVAL;



	/*

	 * While using internal tmio hardware logic for card detection, we need

	 * to ensure it stays powered for it to work.
@@ -1336,8 +1331,6 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host) 


	pm_runtime_put_sync(&pdev->dev);

	pm_runtime_disable(&pdev->dev);



	tmio_mmc_clk_disable(host);

}

EXPORT_SYMBOL_GPL(tmio_mmc_host_remove);

CRA Git | Maintained and supported by SUSTech CRA and CCSE