aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/dw/regs.h
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2014-08-19 13:29:15 -0400
committerVinod Koul <vinod.koul@intel.com>2014-09-11 02:18:13 -0400
commit8950052029874a6738552debb45077c596e90e6b (patch)
tree083a3e015b95ec9415f9ff99638935c9cf5481c9 /drivers/dma/dw/regs.h
parent7e1e2f27c5508518e58e5cbb11e26cbb815f4c56 (diff)
dmaengine: dw: apply both HS interfaces and remove slave_id usage
Instead of one request line member let's use both source and destination ones. Usually we have no such hardware except Atmel MMC controller found on AVR32 platform (see arch/avr32/mach-at32ap/at32ap700x.c and drivers/mmc/host/atmel-mci.c). This patch removes slave_id usage since it'll be removed from the generic structure in later. This breaks the non-ACPI / non-DT cases for the users of the driver, i.e. SPI and HSUART. However, these cases mean only PCI enumerated devices for now, which is anyway broken (considering more than one DMA controller in the system) and this patch series is intended to fix that eventually. The ACPI and DT cases shall be aware of the channel direction when setting request lines, but this is a minor problem that would be addressed in future. Suggested-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/dw/regs.h')
-rw-r--r--drivers/dma/dw/regs.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/dma/dw/regs.h b/drivers/dma/dw/regs.h
index af02439155e9..0e82d9972c17 100644
--- a/drivers/dma/dw/regs.h
+++ b/drivers/dma/dw/regs.h
@@ -221,9 +221,10 @@ struct dw_dma_chan {
221 bool nollp; 221 bool nollp;
222 222
223 /* custom slave configuration */ 223 /* custom slave configuration */
224 unsigned int request_line; 224 u8 src_id;
225 unsigned char src_master; 225 u8 dst_id;
226 unsigned char dst_master; 226 u8 src_master;
227 u8 dst_master;
227 228
228 /* configuration passed via DMA_SLAVE_CONFIG */ 229 /* configuration passed via DMA_SLAVE_CONFIG */
229 struct dma_slave_config dma_sconfig; 230 struct dma_slave_config dma_sconfig;