mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 06:33:07 +00:00
Code Issues Releases Wiki Activity

mmc: tmio: tmio_mmc_host has .clk_disable

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

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Kuninori Morimoto 2015-01-13 04:58:01 +00:00 committed by Ulf Hansson
parent 4fe2ec57a1
commit 00452c11ea
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/mmc/host/sh_mobile_sdhi.c
View file

@ -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) {

1
drivers/mmc/host/tmio_mmc.h
View file

@ -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);

4
drivers/mmc/host/tmio_mmc_pio.c
View file

@ -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;
}

3
include/linux/mfd/tmio.h
View file

@ -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);
};