| Message ID | 87h9vvuvgo.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:58, Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> wrote: > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > Current .dma_rx_offset is implemented under tmio_mmc_dma. > It goes to tmio_mmc_data 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_dma.c | 2 +- > include/linux/mfd/tmio.h | 1 + > 4 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c > index 782d8cf..c06e93b 100644 > --- a/drivers/mmc/host/sh_mobile_sdhi.c > +++ b/drivers/mmc/host/sh_mobile_sdhi.c > @@ -276,7 +276,7 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) > mmc_data->flags |= of_data->tmio_flags; > mmc_data->capabilities |= of_data->capabilities; > mmc_data->capabilities2 |= of_data->capabilities2; > - dma_priv->dma_rx_offset = of_data->dma_rx_offset; > + mmc_data->dma_rx_offset = of_data->dma_rx_offset; > } > > ret = tmio_mmc_host_probe(host, mmc_data); > diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h > index 9482abc..c9a8469 100644 > --- a/drivers/mmc/host/tmio_mmc.h > +++ b/drivers/mmc/host/tmio_mmc.h > @@ -45,7 +45,6 @@ struct tmio_mmc_dma { > void *chan_priv_rx; > int slave_id_tx; > int slave_id_rx; > - dma_addr_t dma_rx_offset; > bool (*filter)(struct dma_chan *chan, void *arg); > }; > > diff --git a/drivers/mmc/host/tmio_mmc_dma.c b/drivers/mmc/host/tmio_mmc_dma.c > index d2b02de..634b2700c 100644 > --- a/drivers/mmc/host/tmio_mmc_dma.c > +++ b/drivers/mmc/host/tmio_mmc_dma.c > @@ -308,7 +308,7 @@ void tmio_mmc_request_dma(struct tmio_mmc_host *host, struct tmio_mmc_data *pdat > if (host->dma->chan_priv_rx) > cfg.slave_id = host->dma->slave_id_rx; > cfg.direction = DMA_DEV_TO_MEM; > - cfg.src_addr = cfg.dst_addr + host->dma->dma_rx_offset; > + cfg.src_addr = cfg.dst_addr + host->pdata->dma_rx_offset; > cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; > cfg.dst_addr = 0; > ret = dmaengine_slave_config(host->chan_rx, &cfg); > diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h > index 28a12d1..807ecfb 100644 > --- a/include/linux/mfd/tmio.h > +++ b/include/linux/mfd/tmio.h > @@ -123,6 +123,7 @@ struct tmio_mmc_data { > u32 ocr_mask; /* available voltages */ > unsigned int cd_gpio; > int alignment_shift; > + dma_addr_t dma_rx_offset; > void (*set_pwr)(struct platform_device *host, int state); > void (*set_clk_div)(struct platform_device *host, int state); > }; > -- > 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:58, Kuninori Morimoto > <kuninori.morimoto.gx@renesas.com> wrote: > > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > > > Current .dma_rx_offset is implemented under tmio_mmc_dma. > > It goes to tmio_mmc_data 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_dma.c | 2 +- > > include/linux/mfd/tmio.h | 1 + > > 4 files changed, 3 insertions(+), 3 deletions(-) Acked-by: Lee Jones <lee.jones@linaro.org> > > diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c > > index 782d8cf..c06e93b 100644 > > --- a/drivers/mmc/host/sh_mobile_sdhi.c > > +++ b/drivers/mmc/host/sh_mobile_sdhi.c > > @@ -276,7 +276,7 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) > > mmc_data->flags |= of_data->tmio_flags; > > mmc_data->capabilities |= of_data->capabilities; > > mmc_data->capabilities2 |= of_data->capabilities2; > > - dma_priv->dma_rx_offset = of_data->dma_rx_offset; > > + mmc_data->dma_rx_offset = of_data->dma_rx_offset; > > } > > > > ret = tmio_mmc_host_probe(host, mmc_data); > > diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h > > index 9482abc..c9a8469 100644 > > --- a/drivers/mmc/host/tmio_mmc.h > > +++ b/drivers/mmc/host/tmio_mmc.h > > @@ -45,7 +45,6 @@ struct tmio_mmc_dma { > > void *chan_priv_rx; > > int slave_id_tx; > > int slave_id_rx; > > - dma_addr_t dma_rx_offset; > > bool (*filter)(struct dma_chan *chan, void *arg); > > }; > > > > diff --git a/drivers/mmc/host/tmio_mmc_dma.c b/drivers/mmc/host/tmio_mmc_dma.c > > index d2b02de..634b2700c 100644 > > --- a/drivers/mmc/host/tmio_mmc_dma.c > > +++ b/drivers/mmc/host/tmio_mmc_dma.c > > @@ -308,7 +308,7 @@ void tmio_mmc_request_dma(struct tmio_mmc_host *host, struct tmio_mmc_data *pdat > > if (host->dma->chan_priv_rx) > > cfg.slave_id = host->dma->slave_id_rx; > > cfg.direction = DMA_DEV_TO_MEM; > > - cfg.src_addr = cfg.dst_addr + host->dma->dma_rx_offset; > > + cfg.src_addr = cfg.dst_addr + host->pdata->dma_rx_offset; > > cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; > > cfg.dst_addr = 0; > > ret = dmaengine_slave_config(host->chan_rx, &cfg); > > diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h > > index 28a12d1..807ecfb 100644 > > --- a/include/linux/mfd/tmio.h > > +++ b/include/linux/mfd/tmio.h > > @@ -123,6 +123,7 @@ struct tmio_mmc_data { > > u32 ocr_mask; /* available voltages */ > > unsigned int cd_gpio; > > int alignment_shift; > > + dma_addr_t dma_rx_offset; > > void (*set_pwr)(struct platform_device *host, int state); > > void (*set_clk_div)(struct platform_device *host, int state); > > }; > >
diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c index 782d8cf..c06e93b 100644 --- a/drivers/mmc/host/sh_mobile_sdhi.c +++ b/drivers/mmc/host/sh_mobile_sdhi.c @@ -276,7 +276,7 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) mmc_data->flags |= of_data->tmio_flags; mmc_data->capabilities |= of_data->capabilities; mmc_data->capabilities2 |= of_data->capabilities2; - dma_priv->dma_rx_offset = of_data->dma_rx_offset; + mmc_data->dma_rx_offset = of_data->dma_rx_offset; } ret = tmio_mmc_host_probe(host, mmc_data); diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index 9482abc..c9a8469 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -45,7 +45,6 @@ struct tmio_mmc_dma { void *chan_priv_rx; int slave_id_tx; int slave_id_rx; - dma_addr_t dma_rx_offset; bool (*filter)(struct dma_chan *chan, void *arg); }; diff --git a/drivers/mmc/host/tmio_mmc_dma.c b/drivers/mmc/host/tmio_mmc_dma.c index d2b02de..634b2700c 100644 --- a/drivers/mmc/host/tmio_mmc_dma.c +++ b/drivers/mmc/host/tmio_mmc_dma.c @@ -308,7 +308,7 @@ void tmio_mmc_request_dma(struct tmio_mmc_host *host, struct tmio_mmc_data *pdat if (host->dma->chan_priv_rx) cfg.slave_id = host->dma->slave_id_rx; cfg.direction = DMA_DEV_TO_MEM; - cfg.src_addr = cfg.dst_addr + host->dma->dma_rx_offset; + cfg.src_addr = cfg.dst_addr + host->pdata->dma_rx_offset; cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; cfg.dst_addr = 0; ret = dmaengine_slave_config(host->chan_rx, &cfg); diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h index 28a12d1..807ecfb 100644 --- a/include/linux/mfd/tmio.h +++ b/include/linux/mfd/tmio.h @@ -123,6 +123,7 @@ struct tmio_mmc_data { u32 ocr_mask; /* available voltages */ unsigned int cd_gpio; int alignment_shift; + dma_addr_t dma_rx_offset; void (*set_pwr)(struct platform_device *host, int state); void (*set_clk_div)(struct platform_device *host, int state); };