Commit 00452c11 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Ulf Hansson
Browse files

mmc: tmio: tmio_mmc_host has .clk_disable 



Current .clk_disable is implemented under tmio_mmc_data.
It goes to tmio_mmc_host by this patch.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 4fe2ec57

drivers/mmc/host/sh_mobile_sdhi.c

+1 −1
Original line number Diff line number Diff line
@@ -216,8 +216,8 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) 
	host->dma		= dma_priv;

	host->write16_hook	= sh_mobile_sdhi_write16_hook;

	host->clk_enable	= sh_mobile_sdhi_clk_enable;

	host->clk_disable	= sh_mobile_sdhi_clk_disable;



	mmc_data->clk_disable = sh_mobile_sdhi_clk_disable;

	mmc_data->capabilities = MMC_CAP_MMC_HIGHSPEED;

	mmc_data->multi_io_quirk = sh_mobile_sdhi_multi_io_quirk;

	if (p) {

drivers/mmc/host/tmio_mmc.h

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ struct tmio_mmc_host { 


	int (*write16_hook)(struct tmio_mmc_host *host, int addr);

	int (*clk_enable)(struct platform_device *pdev, unsigned int *f);

	void (*clk_disable)(struct platform_device *pdev);

};



struct tmio_mmc_host *tmio_mmc_host_alloc(struct platform_device *pdev);

drivers/mmc/host/tmio_mmc_pio.c

+2 −2
Original line number Diff line number Diff line
@@ -1249,8 +1249,8 @@ int tmio_mmc_host_runtime_suspend(struct device *dev) 
	if (host->clk_cache)

		tmio_mmc_clk_stop(host);



	if (host->pdata->clk_disable)

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

	if (host->clk_disable)

		host->clk_disable(host->pdev);



	return 0;

}

include/linux/mfd/tmio.h

+1 −2
Original line number Diff line number Diff line
@@ -125,8 +125,7 @@ struct tmio_mmc_data { 
	unsigned int			cd_gpio;

	void (*set_pwr)(struct platform_device *host, int state);

	void (*set_clk_div)(struct platform_device *host, int state);

	/* clock management callbacks */

	void (*clk_disable)(struct platform_device *pdev);



	int (*multi_io_quirk)(struct mmc_card *card,

			      unsigned int direction, int blk_size);

};