aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2014-08-19 13:29:14 -0400
committerVinod Koul <vinod.koul@intel.com>2014-09-11 02:18:12 -0400
commit7e1e2f27c5508518e58e5cbb11e26cbb815f4c56 (patch)
treefbee764662f30cc35618446958488896be81ae0d /arch
parent61c4319cb523a2346416cddaa7d4e2f9260c14d9 (diff)
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/avr32/mach-at32ap/at32ap700x.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index ec7be287a97e..37b75602adf6 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -1356,10 +1356,8 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
1356 goto fail; 1356 goto fail;
1357 1357
1358 slave->sdata.dma_dev = &dw_dmac0_device.dev; 1358 slave->sdata.dma_dev = &dw_dmac0_device.dev;
1359 slave->sdata.cfg_hi = (DWC_CFGH_SRC_PER(0) 1359 slave->sdata.src_id = 0;
1360 | DWC_CFGH_DST_PER(1)); 1360 slave->sdata.dst_id = 1;
1361 slave->sdata.cfg_lo &= ~(DWC_CFGL_HS_DST_POL
1362 | DWC_CFGL_HS_SRC_POL);
1363 slave->sdata.src_master = 1; 1361 slave->sdata.src_master = 1;
1364 slave->sdata.dst_master = 0; 1362 slave->sdata.dst_master = 0;
1365 1363
@@ -2054,8 +2052,7 @@ at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data,
2054 /* Check if DMA slave interface for capture should be configured. */ 2052 /* Check if DMA slave interface for capture should be configured. */
2055 if (flags & AC97C_CAPTURE) { 2053 if (flags & AC97C_CAPTURE) {
2056 rx_dws->dma_dev = &dw_dmac0_device.dev; 2054 rx_dws->dma_dev = &dw_dmac0_device.dev;
2057 rx_dws->cfg_hi = DWC_CFGH_SRC_PER(3); 2055 rx_dws->src_id = 3;
2058 rx_dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL);
2059 rx_dws->src_master = 0; 2056 rx_dws->src_master = 0;
2060 rx_dws->dst_master = 1; 2057 rx_dws->dst_master = 1;
2061 } 2058 }
@@ -2063,8 +2060,7 @@ at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data,
2063 /* Check if DMA slave interface for playback should be configured. */ 2060 /* Check if DMA slave interface for playback should be configured. */
2064 if (flags & AC97C_PLAYBACK) { 2061 if (flags & AC97C_PLAYBACK) {
2065 tx_dws->dma_dev = &dw_dmac0_device.dev; 2062 tx_dws->dma_dev = &dw_dmac0_device.dev;
2066 tx_dws->cfg_hi = DWC_CFGH_DST_PER(4); 2063 tx_dws->dst_id = 4;
2067 tx_dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL);
2068 tx_dws->src_master = 0; 2064 tx_dws->src_master = 0;
2069 tx_dws->dst_master = 1; 2065 tx_dws->dst_master = 1;
2070 } 2066 }
@@ -2136,8 +2132,7 @@ at32_add_device_abdac(unsigned int id, struct atmel_abdac_pdata *data)
2136 dws = &data->dws; 2132 dws = &data->dws;
2137 2133
2138 dws->dma_dev = &dw_dmac0_device.dev; 2134 dws->dma_dev = &dw_dmac0_device.dev;
2139 dws->cfg_hi = DWC_CFGH_DST_PER(2); 2135 dws->dst_id = 2;
2140 dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL);
2141 dws->src_master = 0; 2136 dws->src_master = 0;
2142 dws->dst_master = 1; 2137 dws->dst_master = 1;
2143 2138