hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dmaengine: dw: convert dw_dma_slave to use explicit HS interfaces 

Instead of exposing the possibility to set DMA registers CFG_HI and CFG_LO
strict user to provide handshake interfaces explicitly.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
This commit is contained in:
Andy Shevchenko 2014-08-19 20:29:14 +03:00 committed by Vinod Koul
parent 61c4319cb5
commit 7e1e2f27c5
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/avr32/mach-at32ap/at32ap700x.c
View File

@ -1356,10 +1356,8 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
goto fail; goto fail;
slave->sdata.dma_dev = &dw_dmac0_device.dev; slave->sdata.dma_dev = &dw_dmac0_device.dev;
slave->sdata.cfg_hi = (DWC_CFGH_SRC_PER(0) slave->sdata.src_id = 0;
| DWC_CFGH_DST_PER(1)); slave->sdata.dst_id = 1;
slave->sdata.cfg_lo &= ~(DWC_CFGL_HS_DST_POL
| DWC_CFGL_HS_SRC_POL);
slave->sdata.src_master = 1; slave->sdata.src_master = 1;
slave->sdata.dst_master = 0; slave->sdata.dst_master = 0;
@ -2054,8 +2052,7 @@ at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data,
/* Check if DMA slave interface for capture should be configured. */ /* Check if DMA slave interface for capture should be configured. */
if (flags & AC97C_CAPTURE) { if (flags & AC97C_CAPTURE) {
rx_dws->dma_dev = &dw_dmac0_device.dev; rx_dws->dma_dev = &dw_dmac0_device.dev;
rx_dws->cfg_hi = DWC_CFGH_SRC_PER(3); rx_dws->src_id = 3;
rx_dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL);
rx_dws->src_master = 0; rx_dws->src_master = 0;
rx_dws->dst_master = 1; rx_dws->dst_master = 1;
} }
@ -2063,8 +2060,7 @@ at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data,
/* Check if DMA slave interface for playback should be configured. */ /* Check if DMA slave interface for playback should be configured. */
if (flags & AC97C_PLAYBACK) { if (flags & AC97C_PLAYBACK) {
tx_dws->dma_dev = &dw_dmac0_device.dev; tx_dws->dma_dev = &dw_dmac0_device.dev;
tx_dws->cfg_hi = DWC_CFGH_DST_PER(4); tx_dws->dst_id = 4;
tx_dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL);
tx_dws->src_master = 0; tx_dws->src_master = 0;
tx_dws->dst_master = 1; tx_dws->dst_master = 1;
} }
@ -2136,8 +2132,7 @@ at32_add_device_abdac(unsigned int id, struct atmel_abdac_pdata *data)
dws = &data->dws; dws = &data->dws;
dws->dma_dev = &dw_dmac0_device.dev; dws->dma_dev = &dw_dmac0_device.dev;
dws->cfg_hi = DWC_CFGH_DST_PER(2); dws->dst_id = 2;
dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL);
dws->src_master = 0; dws->src_master = 0;
dws->dst_master = 1; dws->dst_master = 1;

4
drivers/dma/dw/core.c
View File

@ -155,8 +155,8 @@ static void dwc_initialize(struct dw_dma_chan *dwc)
*/ */
BUG_ON(!dws->dma_dev || dws->dma_dev != dw->dma.dev); BUG_ON(!dws->dma_dev || dws->dma_dev != dw->dma.dev);
cfghi = dws->cfg_hi; cfghi |= DWC_CFGH_DST_PER(dws->dst_id);
cfglo |= dws->cfg_lo & ~DWC_CFGL_CH_PRIOR_MASK; cfghi |= DWC_CFGH_SRC_PER(dws->src_id);
} else { } else {
if (dwc->direction == DMA_MEM_TO_DEV) if (dwc->direction == DMA_MEM_TO_DEV)
cfghi = DWC_CFGH_DST_PER(dwc->request_line); cfghi = DWC_CFGH_DST_PER(dwc->request_line);

10
include/linux/platform_data/dma-dw.h
View File

@ -17,17 +17,15 @@
* struct dw_dma_slave - Controller-specific information about a slave * struct dw_dma_slave - Controller-specific information about a slave
* *
* @dma_dev: required DMA master device. Depricated. * @dma_dev: required DMA master device. Depricated.
* @bus_id: name of this device channel, not just a device name since * @src_id: src request line
* devices may have more than one channel e.g. "foo_tx" * @dst_id: dst request line
* @cfg_hi: Platform-specific initializer for the CFG_HI register
* @cfg_lo: Platform-specific initializer for the CFG_LO register
* @src_master: src master for transfers on allocated channel. * @src_master: src master for transfers on allocated channel.
* @dst_master: dest master for transfers on allocated channel. * @dst_master: dest master for transfers on allocated channel.
*/ */
struct dw_dma_slave { struct dw_dma_slave {
struct device *dma_dev; struct device *dma_dev;
u32 cfg_hi; u8 src_id;
u32 cfg_lo; u8 dst_id;
u8 src_master; u8 src_master;
u8 dst_master; u8 dst_master;
}; };