forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mmc: tmio: tmio_mmc_host has .clk_enable

Browse source 
Current .clk_enable 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:57:52 +00:00 • committed by Ulf Hansson
commit 4fe2ec57a1
4 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -215,8 +215,8 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)
host->dma = dma_priv; host->dma = dma_priv;
host->write16_hook = sh_mobile_sdhi_write16_hook; host->write16_hook = sh_mobile_sdhi_write16_hook;
host->clk_enable = sh_mobile_sdhi_clk_enable;
mmc_data->clk_enable = sh_mobile_sdhi_clk_enable;
mmc_data->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->capabilities = MMC_CAP_MMC_HIGHSPEED;
mmc_data->multi_io_quirk = sh_mobile_sdhi_multi_io_quirk; mmc_data->multi_io_quirk = sh_mobile_sdhi_multi_io_quirk;

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

@ -96,6 +96,7 @@ struct tmio_mmc_host {
bool sdio_irq_enabled; bool sdio_irq_enabled;
int (*write16_hook)(struct tmio_mmc_host *host, int addr); int (*write16_hook)(struct tmio_mmc_host *host, int addr);
int (*clk_enable)(struct platform_device *pdev, unsigned int *f);
}; };
struct tmio_mmc_host *tmio_mmc_host_alloc(struct platform_device *pdev); struct tmio_mmc_host *tmio_mmc_host_alloc(struct platform_device *pdev);

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

@ -835,13 +835,12 @@ fail:
static int tmio_mmc_clk_update(struct tmio_mmc_host *host) static int tmio_mmc_clk_update(struct tmio_mmc_host *host)
{ {
struct mmc_host *mmc = host->mmc; struct mmc_host *mmc = host->mmc;
struct tmio_mmc_data *pdata = host->pdata;
int ret; int ret;
if (!pdata->clk_enable) if (!host->clk_enable)
return -ENOTSUPP; return -ENOTSUPP;
ret = pdata->clk_enable(host->pdev, &mmc->f_max); ret = host->clk_enable(host->pdev, &mmc->f_max);
if (!ret) if (!ret)
mmc->f_min = mmc->f_max / 512; mmc->f_min = mmc->f_max / 512;

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

@ -126,7 +126,6 @@ struct tmio_mmc_data {
void (*set_pwr)(struct platform_device *host, int state); void (*set_pwr)(struct platform_device *host, int state);
void (*set_clk_div)(struct platform_device *host, int state); void (*set_clk_div)(struct platform_device *host, int state);
/* clock management callbacks */ /* clock management callbacks */
int (*clk_enable)(struct platform_device *pdev, unsigned int *f);
void (*clk_disable)(struct platform_device *pdev); void (*clk_disable)(struct platform_device *pdev);
int (*multi_io_quirk)(struct mmc_card *card, int (*multi_io_quirk)(struct mmc_card *card,
unsigned int direction, int blk_size); unsigned int direction, int blk_size);