mirror of
https://github.com/torvalds/linux.git
synced 2024-12-07 11:31:41 +00:00
mmc: tmio: tmio_mmc_data has .dma_rx_offset
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> Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
parent
e471df0bca
commit
8b4c8f32da
@ -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);
|
||||
|
@ -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);
|
||||
};
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user