Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 384b2cbd authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Ulf Hansson
Browse files

mmc: tmio: care about DMA tx/rx addr offset 



Basically, SD_BUF0 Tx/Rx addresses are same
in normal TMIO controller,
but, it is different on Renesas R-Car SDHI controller
if it uses DMAC
(Rx address needs to add 0x2000 to Tx address)

This patch adds new .dma_rx_offset and cares it

Tested-by: default avatarNguyen Xuan Nui <nx-nui@jinso.co.jp>
Tested-by: default avatarHiep Cao Minh <cm-hiep@jinso.co.jp>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 341eb6a4

drivers/mmc/host/sh_mobile_sdhi.c

+3 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ struct sh_mobile_sdhi_of_data { 
	unsigned long tmio_flags;

	unsigned long capabilities;

	unsigned long capabilities2;

	dma_addr_t dma_rx_offset;

};



static const struct sh_mobile_sdhi_of_data sh_mobile_sdhi_of_cfg[] = {
@@ -56,6 +57,7 @@ static const struct sh_mobile_sdhi_of_data of_rcar_gen2_compatible = { 
	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE,

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ,

	.capabilities2	= MMC_CAP2_NO_MULTI_READ,

	.dma_rx_offset	= 0x2000,

};



static const struct of_device_id sh_mobile_sdhi_of_match[] = {
@@ -228,6 +230,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;

	}



	/* SD control register space size is 0x100, 0x200 for bus_shift=1 */

drivers/mmc/host/tmio_mmc_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ void tmio_mmc_request_dma(struct tmio_mmc_host *host, struct tmio_mmc_data *pdat 
		if (pdata->dma->chan_priv_rx)

			cfg.slave_id = pdata->dma->slave_id_rx;

		cfg.direction = DMA_DEV_TO_MEM;

		cfg.src_addr = cfg.dst_addr;

		cfg.src_addr = cfg.dst_addr + pdata->dma->dma_rx_offset;

		cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;

		cfg.dst_addr = 0;

		ret = dmaengine_slave_config(host->chan_rx, &cfg);

include/linux/mfd/tmio.h

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ struct tmio_mmc_dma { 
	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);

};