diff options
| author | Jarkko Nikula <jarkko.nikula@bitmer.com> | 2013-06-15 04:31:03 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-06-18 03:11:59 -0400 |
| commit | 9bd5b2753964e69edef4dac66ea9b21ac2b3d149 (patch) | |
| tree | 402427a75a3930848b9adab08c503620e9e2d3ea | |
| parent | 50a43f0fa9eb1ff8da930f6254bc16519e827922 (diff) | |
ARM: OMAP2+: Remove duplicated DMA channel definitions
Many DMA channel definitions in arch/arm/mach-omap2/dma.h have been moved or
redefined in drivers without removing them from dma.h. Remove those with a
script below:
egrep '#define OMAP.*DMA' arch/arm/mach-omap2/dma.h \
|cut -f 1 |cut -d ' ' -f 1-2 | while read -r i; do \
if [ `git grep -c "$i" |wc -l` -gt 1 ]; then \
echo "removing" $i; \
sed -i "/${i}/d" arch/arm/mach-omap2/dma.h; \
fi; \
done
Signed-off-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap2/dma.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/mach-omap2/dma.h b/arch/arm/mach-omap2/dma.h index 4141ef04ed1d..8a71c7bc8766 100644 --- a/arch/arm/mach-omap2/dma.h +++ b/arch/arm/mach-omap2/dma.h | |||
| @@ -21,30 +21,18 @@ | |||
| 21 | 21 | ||
| 22 | 22 | ||
| 23 | /* DMA channels for 24xx */ | 23 | /* DMA channels for 24xx */ |
| 24 | #define OMAP24XX_DMA_NO_DEVICE 0 | ||
| 25 | #define OMAP24XX_DMA_EXT_DMAREQ0 2 /* S_DMA_1 */ | ||
| 26 | #define OMAP24XX_DMA_EXT_DMAREQ1 3 /* S_DMA_2 */ | ||
| 27 | #define OMAP24XX_DMA_GPMC 4 /* S_DMA_3 */ | ||
| 28 | #define OMAP242X_DMA_EXT_DMAREQ2 14 /* S_DMA_13 */ | ||
| 29 | #define OMAP242X_DMA_EXT_DMAREQ3 15 /* S_DMA_14 */ | ||
| 30 | #define OMAP242X_DMA_EXT_DMAREQ4 16 /* S_DMA_15 */ | ||
| 31 | #define OMAP34XX_DMA_I2C3_TX 25 /* S_DMA_24 */ | 24 | #define OMAP34XX_DMA_I2C3_TX 25 /* S_DMA_24 */ |
| 32 | #define OMAP34XX_DMA_I2C3_RX 26 /* S_DMA_25 */ | 25 | #define OMAP34XX_DMA_I2C3_RX 26 /* S_DMA_25 */ |
| 33 | #define OMAP24XX_DMA_I2C1_TX 27 /* S_DMA_26 */ | 26 | #define OMAP24XX_DMA_I2C1_TX 27 /* S_DMA_26 */ |
| 34 | #define OMAP24XX_DMA_I2C1_RX 28 /* S_DMA_27 */ | 27 | #define OMAP24XX_DMA_I2C1_RX 28 /* S_DMA_27 */ |
| 35 | #define OMAP24XX_DMA_I2C2_TX 29 /* S_DMA_28 */ | 28 | #define OMAP24XX_DMA_I2C2_TX 29 /* S_DMA_28 */ |
| 36 | #define OMAP24XX_DMA_I2C2_RX 30 /* S_DMA_29 */ | 29 | #define OMAP24XX_DMA_I2C2_RX 30 /* S_DMA_29 */ |
| 37 | #define OMAP24XX_DMA_MMC2_TX 47 /* S_DMA_46 */ | ||
| 38 | #define OMAP24XX_DMA_MMC2_RX 48 /* S_DMA_47 */ | ||
| 39 | #define OMAP24XX_DMA_UART1_TX 49 /* S_DMA_48 */ | 30 | #define OMAP24XX_DMA_UART1_TX 49 /* S_DMA_48 */ |
| 40 | #define OMAP24XX_DMA_UART1_RX 50 /* S_DMA_49 */ | 31 | #define OMAP24XX_DMA_UART1_RX 50 /* S_DMA_49 */ |
| 41 | #define OMAP24XX_DMA_UART2_TX 51 /* S_DMA_50 */ | 32 | #define OMAP24XX_DMA_UART2_TX 51 /* S_DMA_50 */ |
| 42 | #define OMAP24XX_DMA_UART2_RX 52 /* S_DMA_51 */ | 33 | #define OMAP24XX_DMA_UART2_RX 52 /* S_DMA_51 */ |
| 43 | #define OMAP24XX_DMA_UART3_TX 53 /* S_DMA_52 */ | 34 | #define OMAP24XX_DMA_UART3_TX 53 /* S_DMA_52 */ |
| 44 | #define OMAP24XX_DMA_UART3_RX 54 /* S_DMA_53 */ | 35 | #define OMAP24XX_DMA_UART3_RX 54 /* S_DMA_53 */ |
| 45 | #define OMAP24XX_DMA_MMC1_TX 61 /* S_DMA_60 */ | ||
| 46 | #define OMAP24XX_DMA_MMC1_RX 62 /* S_DMA_61 */ | ||
| 47 | #define OMAP242X_DMA_EXT_DMAREQ5 64 /* S_DMA_63 */ | ||
| 48 | #define OMAP34XX_DMA_AES2_TX 65 /* S_DMA_64 */ | 36 | #define OMAP34XX_DMA_AES2_TX 65 /* S_DMA_64 */ |
| 49 | #define OMAP34XX_DMA_AES2_RX 66 /* S_DMA_65 */ | 37 | #define OMAP34XX_DMA_AES2_RX 66 /* S_DMA_65 */ |
| 50 | #define OMAP34XX_DMA_SHA1MD5_RX 69 /* S_DMA_68 */ | 38 | #define OMAP34XX_DMA_SHA1MD5_RX 69 /* S_DMA_68 */ |