| Message ID | 87oaq3uvif.wl%kuninori.morimoto.gx@renesas.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
+ MFD maintainer On 13 January 2015 at 05:57, Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> wrote: > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > 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> > --- > drivers/mmc/host/sh_mobile_sdhi.c | 2 +- > drivers/mmc/host/tmio_mmc.h | 1 + > drivers/mmc/host/tmio_mmc_pio.c | 5 ++--- > include/linux/mfd/tmio.h | 1 - > 4 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c > index 77ff062..87af77d 100644 > --- a/drivers/mmc/host/sh_mobile_sdhi.c > +++ b/drivers/mmc/host/sh_mobile_sdhi.c > @@ -215,8 +215,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; > > - mmc_data->clk_enable = sh_mobile_sdhi_clk_enable; > 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; > diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h > index 3fa96b1..5cd2986 100644 > --- a/drivers/mmc/host/tmio_mmc.h > +++ b/drivers/mmc/host/tmio_mmc.h > @@ -96,6 +96,7 @@ struct tmio_mmc_host { > bool sdio_irq_enabled; > > 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); > diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c > index fe434cc..1528c88 100644 > --- a/drivers/mmc/host/tmio_mmc_pio.c > +++ b/drivers/mmc/host/tmio_mmc_pio.c > @@ -835,13 +835,12 @@ fail: > static int tmio_mmc_clk_update(struct tmio_mmc_host *host) > { > struct mmc_host *mmc = host->mmc; > - struct tmio_mmc_data *pdata = host->pdata; > int ret; > > - if (!pdata->clk_enable) > + if (!host->clk_enable) > return -ENOTSUPP; > > - ret = pdata->clk_enable(host->pdev, &mmc->f_max); > + ret = host->clk_enable(host->pdev, &mmc->f_max); > if (!ret) > mmc->f_min = mmc->f_max / 512; > > diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h > index 0872ca1..472587a 100644 > --- a/include/linux/mfd/tmio.h > +++ b/include/linux/mfd/tmio.h > @@ -126,7 +126,6 @@ struct tmio_mmc_data { > void (*set_pwr)(struct platform_device *host, int state); > void (*set_clk_div)(struct platform_device *host, int state); > /* clock management callbacks */ > - int (*clk_enable)(struct platform_device *pdev, unsigned int *f); > void (*clk_disable)(struct platform_device *pdev); > int (*multi_io_quirk)(struct mmc_card *card, > unsigned int direction, int blk_size); > -- > 1.7.9.5 > -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, 20 Jan 2015, Ulf Hansson wrote: > + MFD maintainer > > On 13 January 2015 at 05:57, Kuninori Morimoto > <kuninori.morimoto.gx@renesas.com> wrote: > > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > > > 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> > > --- > > drivers/mmc/host/sh_mobile_sdhi.c | 2 +- > > drivers/mmc/host/tmio_mmc.h | 1 + > > drivers/mmc/host/tmio_mmc_pio.c | 5 ++--- > > include/linux/mfd/tmio.h | 1 - Acked-by: Lee Jones <lee.jones@linaro.org> > > 4 files changed, 4 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c > > index 77ff062..87af77d 100644 > > --- a/drivers/mmc/host/sh_mobile_sdhi.c > > +++ b/drivers/mmc/host/sh_mobile_sdhi.c > > @@ -215,8 +215,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; > > > > - mmc_data->clk_enable = sh_mobile_sdhi_clk_enable; > > 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; > > diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h > > index 3fa96b1..5cd2986 100644 > > --- a/drivers/mmc/host/tmio_mmc.h > > +++ b/drivers/mmc/host/tmio_mmc.h > > @@ -96,6 +96,7 @@ struct tmio_mmc_host { > > bool sdio_irq_enabled; > > > > 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); > > diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c > > index fe434cc..1528c88 100644 > > --- a/drivers/mmc/host/tmio_mmc_pio.c > > +++ b/drivers/mmc/host/tmio_mmc_pio.c > > @@ -835,13 +835,12 @@ fail: > > static int tmio_mmc_clk_update(struct tmio_mmc_host *host) > > { > > struct mmc_host *mmc = host->mmc; > > - struct tmio_mmc_data *pdata = host->pdata; > > int ret; > > > > - if (!pdata->clk_enable) > > + if (!host->clk_enable) > > return -ENOTSUPP; > > > > - ret = pdata->clk_enable(host->pdev, &mmc->f_max); > > + ret = host->clk_enable(host->pdev, &mmc->f_max); > > if (!ret) > > mmc->f_min = mmc->f_max / 512; > > > > diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h > > index 0872ca1..472587a 100644 > > --- a/include/linux/mfd/tmio.h > > +++ b/include/linux/mfd/tmio.h > > @@ -126,7 +126,6 @@ struct tmio_mmc_data { > > void (*set_pwr)(struct platform_device *host, int state); > > void (*set_clk_div)(struct platform_device *host, int state); > > /* clock management callbacks */ > > - int (*clk_enable)(struct platform_device *pdev, unsigned int *f); > > void (*clk_disable)(struct platform_device *pdev); > > int (*multi_io_quirk)(struct mmc_card *card, > > unsigned int direction, int blk_size); > >
diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c index 77ff062..87af77d 100644 --- a/drivers/mmc/host/sh_mobile_sdhi.c +++ b/drivers/mmc/host/sh_mobile_sdhi.c @@ -215,8 +215,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; - mmc_data->clk_enable = sh_mobile_sdhi_clk_enable; 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; diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index 3fa96b1..5cd2986 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -96,6 +96,7 @@ struct tmio_mmc_host { bool sdio_irq_enabled; 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); diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index fe434cc..1528c88 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c @@ -835,13 +835,12 @@ fail: static int tmio_mmc_clk_update(struct tmio_mmc_host *host) { struct mmc_host *mmc = host->mmc; - struct tmio_mmc_data *pdata = host->pdata; int ret; - if (!pdata->clk_enable) + if (!host->clk_enable) return -ENOTSUPP; - ret = pdata->clk_enable(host->pdev, &mmc->f_max); + ret = host->clk_enable(host->pdev, &mmc->f_max); if (!ret) mmc->f_min = mmc->f_max / 512; diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h index 0872ca1..472587a 100644 --- a/include/linux/mfd/tmio.h +++ b/include/linux/mfd/tmio.h @@ -126,7 +126,6 @@ struct tmio_mmc_data { void (*set_pwr)(struct platform_device *host, int state); void (*set_clk_div)(struct platform_device *host, int state); /* clock management callbacks */ - int (*clk_enable)(struct platform_device *pdev, unsigned int *f); void (*clk_disable)(struct platform_device *pdev); int (*multi_io_quirk)(struct mmc_card *card, unsigned int direction, int blk_size);