From: Lee Jones <lee.jones@linaro.org>
To: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Chris Ball <cjb@laptop.org>, Simon <horms@verge.net.au>,
Linux-SH <linux-sh@vger.kernel.org>,
linux-mmc <linux-mmc@vger.kernel.org>
Subject: Re: [PATCH 09/17] mmc: tmio: tmio_mmc_data has .dma_rx_offset
Date: Tue, 20 Jan 2015 09:34:16 +0000 [thread overview]
Message-ID: <20150120093416.GC5767@x1> (raw)
In-Reply-To: <CAPDyKFpk-Zi_3ad4nDptkYC_hnjWoSWO-Qi4PzawW-8qyZu0jQ@mail.gmail.com>
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);
> > };
> >
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
next prev parent reply other threads:[~2015-01-20 9:34 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <201501131902.WqokttpY%fengguang.wu@intel.com>
2015-01-13 4:56 ` [PATCH 0/17 v2] tmio: mmc: header cleanup / sh_mobile_cleanup Kuninori Morimoto
2015-01-13 4:57 ` [PATCH 01/17] mmc: tmio: add tmio_mmc_host_alloc/free() Kuninori Morimoto
2015-01-20 9:10 ` Ulf Hansson
2015-01-20 9:38 ` Lee Jones
2015-01-13 4:57 ` [PATCH 02/17] mmc: tmio: tmio_mmc_host has .dma Kuninori Morimoto
2015-01-20 9:10 ` Ulf Hansson
2015-01-20 9:37 ` Lee Jones
2015-01-13 4:57 ` [PATCH 03/17] mmc: tmio: tmio_mmc_host has .write16_hook Kuninori Morimoto
2015-01-20 9:11 ` Ulf Hansson
2015-01-20 9:37 ` Lee Jones
2015-01-13 4:57 ` [PATCH 04/17] mmc: tmio: tmio_mmc_host has .clk_enable Kuninori Morimoto
2015-01-20 9:11 ` Ulf Hansson
2015-01-20 9:36 ` Lee Jones
2015-01-13 4:58 ` [PATCH 05/17] mmc: tmio: tmio_mmc_host has .clk_disable Kuninori Morimoto
2015-01-20 9:11 ` Ulf Hansson
2015-01-20 9:36 ` Lee Jones
2015-01-13 4:58 ` [PATCH 06/17] mmc: tmio: tmio_mmc_host has .multi_io_quirk Kuninori Morimoto
2015-01-20 9:12 ` Ulf Hansson
2015-01-20 9:35 ` Lee Jones
2015-01-13 4:58 ` [PATCH 07/17] mmc: tmio: tmio_mmc_host has .bus_shift Kuninori Morimoto
2015-01-20 9:12 ` Ulf Hansson
2015-01-20 9:35 ` Lee Jones
2015-01-13 4:58 ` [PATCH 08/17] mmc: tmio: tmio_mmc_data has .alignment_shift Kuninori Morimoto
2015-01-20 9:13 ` Ulf Hansson
2015-01-20 9:34 ` Lee Jones
2015-01-13 4:58 ` [PATCH 09/17] mmc: tmio: tmio_mmc_data has .dma_rx_offset Kuninori Morimoto
2015-01-20 9:13 ` Ulf Hansson
2015-01-20 9:34 ` Lee Jones [this message]
2015-01-13 4:59 ` [PATCH 10/17] mmc: tmio: add .enable_dma on tmio_mmc_data Kuninori Morimoto
2015-01-13 4:59 ` [PATCH 11/17] mmc: tmio: enable SoC specific DMA buswidth settings Kuninori Morimoto
2015-01-13 4:59 ` [PATCH 12/17] mmc: sh_mobile_sdhi: remove .init/.cleanup Kuninori Morimoto
2015-01-13 4:59 ` [PATCH 13/17] mmc: sh_mobile_sdhi: tidyup mmc_data->bus_shift for latest SoC Kuninori Morimoto
2015-01-13 4:59 ` [PATCH 14/17] mmc: sh_mobile_sdhi: add new macro for mmc_host to sh_mobile_sdhi Kuninori Morimoto
2015-01-13 4:59 ` [PATCH 15/17] mmc: sh_mobile_sdhi: use .enable_dma Kuninori Morimoto
2015-01-13 5:00 ` [PATCH 16/17] mmc: sh_mobile_sdhi: enable 32bit DMA access Kuninori Morimoto
2015-01-13 5:00 ` [PATCH 17/17] mmc: tmio: remove TMIO_MMC_HAVE_CTL_DMA_REG flag Kuninori Morimoto
2015-01-20 9:14 ` Ulf Hansson
2015-01-20 9:33 ` Lee Jones
2015-01-13 9:35 ` [PATCH 0/17 v2] tmio: mmc: header cleanup / sh_mobile_cleanup Ulf Hansson
2015-01-14 8:30 ` [PATCH] mmc: tmio: add missing EXPORT_SYMBOL for tmio_mmc_host_alloc/free Ulf Hansson
2015-01-14 8:57 ` Kuninori Morimoto
2015-01-20 9:15 ` Ulf Hansson
2015-01-20 9:09 ` [PATCH 0/17 v2] tmio: mmc: header cleanup / sh_mobile_cleanup Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150120093416.GC5767@x1 \
--to=lee.jones@linaro.org \
--cc=arnd@arndb.de \
--cc=cjb@laptop.org \
--cc=horms@verge.net.au \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox