On Tue, 20 Jan 2015, Ulf Hansson wrote:
> + MFD maintainer
>
> On 13 January 2015 at 05:58, Kuninori Morimoto
> <kuninori.morimoto.gx@xxxxxxxxxxx> wrote:
> > From: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
> >
> > Current .alignment_shift is implemented under tmio_mmc_dma.
> > It goes to tmio_mmc_data by this patch.
> >
> > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
> > ---
> > drivers/mmc/host/sh_mobile_sdhi.c | 4 ++--
> > drivers/mmc/host/tmio_mmc.h | 1 -
> > drivers/mmc/host/tmio_mmc_dma.c | 4 ++--
> > include/linux/mfd/tmio.h | 1 +
Acked-by: Lee Jones <lee.jones@xxxxxxxxxx>
> > 4 files changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
> > index 0db2a0a..782d8cf 100644
> > --- a/drivers/mmc/host/sh_mobile_sdhi.c
> > +++ b/drivers/mmc/host/sh_mobile_sdhi.c
> > @@ -241,10 +241,10 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)
> > dma_priv->slave_id_rx = p->dma_slave_rx;
> > }
> > }
> > -
> > - dma_priv->alignment_shift = 1; /* 2-byte alignment */
> > dma_priv->filter = shdma_chan_filter;
> >
> > + mmc_data->alignment_shift = 1; /* 2-byte alignment */
> > +
> > /*
> > * All SDHI blocks support 2-byte and larger block sizes in 4-bit
> > * bus width mode.
> > diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
> > index a5d30bf..9482abc 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;
> > - int alignment_shift;
> > 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 ee0131e..d2b02de 100644
> > --- a/drivers/mmc/host/tmio_mmc_dma.c
> > +++ b/drivers/mmc/host/tmio_mmc_dma.c
> > @@ -52,7 +52,7 @@ static void tmio_mmc_start_dma_rx(struct tmio_mmc_host *host)
> > dma_cookie_t cookie;
> > int ret, i;
> > bool aligned = true, multiple = true;
> > - unsigned int align = (1 << host->dma->alignment_shift) - 1;
> > + unsigned int align = (1 << host->pdata->alignment_shift) - 1;
> >
> > for_each_sg(sg, sg_tmp, host->sg_len, i) {
> > if (sg_tmp->offset & align)
> > @@ -128,7 +128,7 @@ static void tmio_mmc_start_dma_tx(struct tmio_mmc_host *host)
> > dma_cookie_t cookie;
> > int ret, i;
> > bool aligned = true, multiple = true;
> > - unsigned int align = (1 << host->dma->alignment_shift) - 1;
> > + unsigned int align = (1 << host->pdata->alignment_shift) - 1;
> >
> > for_each_sg(sg, sg_tmp, host->sg_len, i) {
> > if (sg_tmp->offset & align)
> > diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
> > index 7a5c279..28a12d1 100644
> > --- a/include/linux/mfd/tmio.h
> > +++ b/include/linux/mfd/tmio.h
> > @@ -122,6 +122,7 @@ struct tmio_mmc_data {
> > unsigned long flags;
> > u32 ocr_mask; /* available voltages */
> > unsigned int cd_gpio;
> > + int alignment_shift;
> > 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
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
