ARM: OMAP2+: hwmod: Remove remaining DMA channel definitions

Last remaining DMA channel definitions in arch/arm/mach-omap2/dma.h
are used only by omap_hwmod_2xxx_3xxx_ipblock_data.c and
omap_hwmod_3xxx_data.c. Remove them by using directly DMA channel number in
hwmod data and drop definitions with a following script:

egrep '#define [OMAP|AM35XX].*DMA' arch/arm/mach-omap2/dma.h | cut -f 1,3 \
	| while read i; do \
		DEF=`echo $i |cut -d ' ' -f 2`; \
		CH=`echo $i |cut -d ' ' -f 3`; \
		echo "removing" $DEF; \
		sed -i "s/${DEF}/${CH}/" arch/arm/mach-omap2/omap_hwmod_*.c; \
		sed -i "/${DEF}/d" arch/arm/mach-omap2/dma.h; \
	done

Signed-off-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 31c7126eb3bb..33d562017d1f 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -548,8 +548,8 @@ static struct omap_hwmod_irq_info uart4_mpu_irqs[] = {
 };
 
 static struct omap_hwmod_dma_info uart4_sdma_reqs[] = {
-        { .name = "rx", .dma_req = OMAP36XX_DMA_UART4_RX, },
-        { .name = "tx", .dma_req = OMAP36XX_DMA_UART4_TX, },
+        { .name = "rx", .dma_req = 82, },
+        { .name = "tx", .dma_req = 81, },
         { .dma_req = -1 }
 };
 
@@ -577,8 +577,8 @@ static struct omap_hwmod_irq_info am35xx_uart4_mpu_irqs[] = {
 };
 
 static struct omap_hwmod_dma_info am35xx_uart4_sdma_reqs[] = {
-        { .name = "rx", .dma_req = AM35XX_DMA_UART4_RX, },
-        { .name = "tx", .dma_req = AM35XX_DMA_UART4_TX, },
+        { .name = "rx", .dma_req = 55, },
+        { .name = "tx", .dma_req = 54, },
         { .dma_req = -1 }
 };
 
@@ -857,8 +857,8 @@ static struct omap_hwmod_irq_info i2c3_mpu_irqs[] = {
 };
 
 static struct omap_hwmod_dma_info i2c3_sdma_reqs[] = {
-        { .name = "tx", .dma_req = OMAP34XX_DMA_I2C3_TX },
-        { .name = "rx", .dma_req = OMAP34XX_DMA_I2C3_RX },
+        { .name = "tx", .dma_req = 25 },
+        { .name = "rx", .dma_req = 26 },
         { .dma_req = -1 }
 };
 
@@ -3581,7 +3581,7 @@ static struct omap_hwmod_irq_info omap3_sham_mpu_irqs[] = {
 };
 
 static struct omap_hwmod_dma_info omap3_sham_sdma_reqs[] = {
-        { .name = "rx", .dma_req = OMAP34XX_DMA_SHA1MD5_RX, },
+        { .name = "rx", .dma_req = 69, },
         { .dma_req = -1 }
 };
 
@@ -3642,8 +3642,8 @@ static struct omap_hwmod_class omap3xxx_aes_class = {
 };
 
 static struct omap_hwmod_dma_info omap3_aes_sdma_reqs[] = {
-        { .name = "tx", .dma_req = OMAP34XX_DMA_AES2_TX, },
-        { .name = "rx", .dma_req = OMAP34XX_DMA_AES2_RX, },
+        { .name = "tx", .dma_req = 65, },
+        { .name = "rx", .dma_req = 66, },
         { .dma_req = -1 }
 };