dmaengine: ste_dma40: Amalgamate DMA source and destination channel numbers

Devices which utilise DMA use the same device numbers for transmitting
and receiving. In this patch we encode the source and destination
information into one single attribute. We can subsequently exploit the
direction attribute to see which of the transfer directions are being
described. This also lessens the burden on platform data.

Cc: Dan Williams <djbw@fb.com>
Cc: Per Forlin <per.forlin@stericsson.com>
Cc: Rabin Vincent <rabin@rab.in>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

1 files changed, 16 insertions, 16 deletions

diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index e90b5ab23b6d..67d68e05f3a7 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -163,25 +163,25 @@ static void __init db8500_add_gpios(struct device *parent)
 }
 
 static int usb_db8500_rx_dma_cfg[] = {
-        DB8500_DMA_DEV38_USB_OTG_IEP_1_9,
-        DB8500_DMA_DEV37_USB_OTG_IEP_2_10,
-        DB8500_DMA_DEV36_USB_OTG_IEP_3_11,
-        DB8500_DMA_DEV19_USB_OTG_IEP_4_12,
-        DB8500_DMA_DEV18_USB_OTG_IEP_5_13,
-        DB8500_DMA_DEV17_USB_OTG_IEP_6_14,
-        DB8500_DMA_DEV16_USB_OTG_IEP_7_15,
-        DB8500_DMA_DEV39_USB_OTG_IEP_8
+        DB8500_DMA_DEV38_USB_OTG_IEP_AND_OEP_1_9,
+        DB8500_DMA_DEV37_USB_OTG_IEP_AND_OEP_2_10,
+        DB8500_DMA_DEV36_USB_OTG_IEP_AND_OEP_3_11,
+        DB8500_DMA_DEV19_USB_OTG_IEP_AND_OEP_4_12,
+        DB8500_DMA_DEV18_USB_OTG_IEP_AND_OEP_5_13,
+        DB8500_DMA_DEV17_USB_OTG_IEP_AND_OEP_6_14,
+        DB8500_DMA_DEV16_USB_OTG_IEP_AND_OEP_7_15,
+        DB8500_DMA_DEV39_USB_OTG_IEP_AND_OEP_8
 };
 
 static int usb_db8500_tx_dma_cfg[] = {
-        DB8500_DMA_DEV38_USB_OTG_OEP_1_9,
-        DB8500_DMA_DEV37_USB_OTG_OEP_2_10,
-        DB8500_DMA_DEV36_USB_OTG_OEP_3_11,
-        DB8500_DMA_DEV19_USB_OTG_OEP_4_12,
-        DB8500_DMA_DEV18_USB_OTG_OEP_5_13,
-        DB8500_DMA_DEV17_USB_OTG_OEP_6_14,
-        DB8500_DMA_DEV16_USB_OTG_OEP_7_15,
-        DB8500_DMA_DEV39_USB_OTG_OEP_8
+        DB8500_DMA_DEV38_USB_OTG_IEP_AND_OEP_1_9,
+        DB8500_DMA_DEV37_USB_OTG_IEP_AND_OEP_2_10,
+        DB8500_DMA_DEV36_USB_OTG_IEP_AND_OEP_3_11,
+        DB8500_DMA_DEV19_USB_OTG_IEP_AND_OEP_4_12,
+        DB8500_DMA_DEV18_USB_OTG_IEP_AND_OEP_5_13,
+        DB8500_DMA_DEV17_USB_OTG_IEP_AND_OEP_6_14,
+        DB8500_DMA_DEV16_USB_OTG_IEP_AND_OEP_7_15,
+        DB8500_DMA_DEV39_USB_OTG_IEP_AND_OEP_8
 };
 
 static const char *db8500_read_soc_id(void)