Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: OMAP1: Remove McBSP DMA channel definitions

arch/arm/mach-omap1/mcbsp.c is only place where OMAP1 McBSP DMA channel
definitions are set. We may well use numerical values there and get rid
of their definitions in arch/arm/mach-omap1/dma.h.

Remove dma.h include from arch/arm/mach-omap1/mcbsp.c and use following
script for replacing definitions with DMA channel number:

egrep '#define OMAP_DMA_MCBSP' arch/arm/mach-omap1/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-omap1/mcbsp.c; \
sed -i "/${DEF}/d" arch/arm/mach-omap1/dma.h; \
done

Signed-off-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

authored by

Jarkko Nikula and committed by
Tony Lindgren
c821c462 da4f9d28

+16 -23
-6
arch/arm/mach-omap1/dma.h
··· 21 21 22 22 /* DMA channels for omap1 */ 23 23 #define OMAP_DMA_NO_DEVICE 0 24 - #define OMAP_DMA_MCBSP1_TX 8 25 - #define OMAP_DMA_MCBSP1_RX 9 26 - #define OMAP_DMA_MCBSP3_TX 10 27 - #define OMAP_DMA_MCBSP3_RX 11 28 - #define OMAP_DMA_MCBSP2_TX 16 29 - #define OMAP_DMA_MCBSP2_RX 17 30 24 #define OMAP_DMA_UART3_TX 18 31 25 #define OMAP_DMA_UART3_RX 19 32 26 #define OMAP_DMA_CAMERA_IF_RX 20
+16 -17
arch/arm/mach-omap1/mcbsp.c
··· 27 27 #include <mach/irqs.h> 28 28 29 29 #include "iomap.h" 30 - #include "dma.h" 31 30 32 31 #define DPS_RSTCT2_PER_EN (1 << 0) 33 32 #define DSP_RSTCT2_WD_PER_EN (1 << 1) ··· 113 114 }, 114 115 { 115 116 .name = "rx", 116 - .start = OMAP_DMA_MCBSP1_RX, 117 + .start = 9, 117 118 .flags = IORESOURCE_DMA, 118 119 }, 119 120 { 120 121 .name = "tx", 121 - .start = OMAP_DMA_MCBSP1_TX, 122 + .start = 8, 122 123 .flags = IORESOURCE_DMA, 123 124 }, 124 125 }, ··· 140 141 }, 141 142 { 142 143 .name = "rx", 143 - .start = OMAP_DMA_MCBSP3_RX, 144 + .start = 11, 144 145 .flags = IORESOURCE_DMA, 145 146 }, 146 147 { 147 148 .name = "tx", 148 - .start = OMAP_DMA_MCBSP3_TX, 149 + .start = 10, 149 150 .flags = IORESOURCE_DMA, 150 151 }, 151 152 }, ··· 190 191 }, 191 192 { 192 193 .name = "rx", 193 - .start = OMAP_DMA_MCBSP1_RX, 194 + .start = 9, 194 195 .flags = IORESOURCE_DMA, 195 196 }, 196 197 { 197 198 .name = "tx", 198 - .start = OMAP_DMA_MCBSP1_TX, 199 + .start = 8, 199 200 .flags = IORESOURCE_DMA, 200 201 }, 201 202 }, ··· 217 218 }, 218 219 { 219 220 .name = "rx", 220 - .start = OMAP_DMA_MCBSP2_RX, 221 + .start = 17, 221 222 .flags = IORESOURCE_DMA, 222 223 }, 223 224 { 224 225 .name = "tx", 225 - .start = OMAP_DMA_MCBSP2_TX, 226 + .start = 16, 226 227 .flags = IORESOURCE_DMA, 227 228 }, 228 229 }, ··· 244 245 }, 245 246 { 246 247 .name = "rx", 247 - .start = OMAP_DMA_MCBSP3_RX, 248 + .start = 11, 248 249 .flags = IORESOURCE_DMA, 249 250 }, 250 251 { 251 252 .name = "tx", 252 - .start = OMAP_DMA_MCBSP3_TX, 253 + .start = 10, 253 254 .flags = IORESOURCE_DMA, 254 255 }, 255 256 }, ··· 297 298 }, 298 299 { 299 300 .name = "rx", 300 - .start = OMAP_DMA_MCBSP1_RX, 301 + .start = 9, 301 302 .flags = IORESOURCE_DMA, 302 303 }, 303 304 { 304 305 .name = "tx", 305 - .start = OMAP_DMA_MCBSP1_TX, 306 + .start = 8, 306 307 .flags = IORESOURCE_DMA, 307 308 }, 308 309 }, ··· 324 325 }, 325 326 { 326 327 .name = "rx", 327 - .start = OMAP_DMA_MCBSP2_RX, 328 + .start = 17, 328 329 .flags = IORESOURCE_DMA, 329 330 }, 330 331 { 331 332 .name = "tx", 332 - .start = OMAP_DMA_MCBSP2_TX, 333 + .start = 16, 333 334 .flags = IORESOURCE_DMA, 334 335 }, 335 336 }, ··· 351 352 }, 352 353 { 353 354 .name = "rx", 354 - .start = OMAP_DMA_MCBSP3_RX, 355 + .start = 11, 355 356 .flags = IORESOURCE_DMA, 356 357 }, 357 358 { 358 359 .name = "tx", 359 - .start = OMAP_DMA_MCBSP3_TX, 360 + .start = 10, 360 361 .flags = IORESOURCE_DMA, 361 362 }, 362 363 },