diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-02 12:03:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-02 12:03:55 -0400 |
| commit | a7726350e06401929eac0aa0677a5467106565fc (patch) | |
| tree | e189513e5014bdfccd73a3af731a6b57733743fa /arch/arm/mach-omap1 | |
| parent | 4d26aa305414dbb33b3c32fb205b68004cda8ffc (diff) | |
| parent | afcf7924ecab726dab0227188783c4a40d9f0eec (diff) | |
Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC cleanup from Olof Johansson:
"Here is a collection of cleanup patches. Among the pieces that stand
out are:
- The deletion of h720x platforms
- Split of at91 non-dt platforms to their own Kconfig file to keep
them separate
- General cleanups and refactoring of i.MX and MXS platforms
- Some restructuring of clock tables for OMAP
- Convertion of PMC driver for Tegra to dt-only
- Some renames of sunxi -> sun4i (Allwinner A10)
- ... plus a bunch of other stuff that I haven't mentioned"
* tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (119 commits)
ARM: i.MX: remove unused ARCH_* configs
ARM i.MX53: remove platform ahci support
ARM: sunxi: Rework the restart code
irqchip: sunxi: Rename sunxi to sun4i
irqchip: sunxi: Make use of the IRQCHIP_DECLARE macro
clocksource: sunxi: Rename sunxi to sun4i
clocksource: sunxi: make use of CLKSRC_OF
clocksource: sunxi: Cleanup the timer code
ARM: at91: remove trailing semicolon from macros
ARM: at91/setup: fix trivial typos
ARM: EXYNOS: remove "config EXYNOS_DEV_DRM"
ARM: EXYNOS: change the name of USB ohci header
ARM: SAMSUNG: Remove unnecessary code for dma
ARM: S3C24XX: Remove unused GPIO drive strength register definitions
ARM: OMAP4+: PM: Restore CPU power state to ON with clockdomain force wakeup method
ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2412
ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2410
ARM: S3C24XX: Removed unneeded dependency on ARCH_S3C24XX for boards
ARM: SAMSUNG: Fix typo "CONFIG_SAMSUNG_DEV_RTC"
ARM: S5P64X0: Fix typo "CONFIG_S5P64X0_SETUP_SDHCI"
...
Diffstat (limited to 'arch/arm/mach-omap1')
| -rw-r--r-- | arch/arm/mach-omap1/dma.h | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/arch/arm/mach-omap1/dma.h b/arch/arm/mach-omap1/dma.h index da6345dab03f..d05909c96715 100644 --- a/arch/arm/mach-omap1/dma.h +++ b/arch/arm/mach-omap1/dma.h | |||
| @@ -21,21 +21,10 @@ | |||
| 21 | 21 | ||
| 22 | /* DMA channels for omap1 */ | 22 | /* DMA channels for omap1 */ |
| 23 | #define OMAP_DMA_NO_DEVICE 0 | 23 | #define OMAP_DMA_NO_DEVICE 0 |
| 24 | #define OMAP_DMA_MCSI1_TX 1 | ||
| 25 | #define OMAP_DMA_MCSI1_RX 2 | ||
| 26 | #define OMAP_DMA_I2C_RX 3 | ||
| 27 | #define OMAP_DMA_I2C_TX 4 | ||
| 28 | #define OMAP_DMA_EXT_NDMA_REQ 5 | ||
| 29 | #define OMAP_DMA_EXT_NDMA_REQ2 6 | ||
| 30 | #define OMAP_DMA_UWIRE_TX 7 | ||
| 31 | #define OMAP_DMA_MCBSP1_TX 8 | 24 | #define OMAP_DMA_MCBSP1_TX 8 |
| 32 | #define OMAP_DMA_MCBSP1_RX 9 | 25 | #define OMAP_DMA_MCBSP1_RX 9 |
| 33 | #define OMAP_DMA_MCBSP3_TX 10 | 26 | #define OMAP_DMA_MCBSP3_TX 10 |
| 34 | #define OMAP_DMA_MCBSP3_RX 11 | 27 | #define OMAP_DMA_MCBSP3_RX 11 |
| 35 | #define OMAP_DMA_UART1_TX 12 | ||
| 36 | #define OMAP_DMA_UART1_RX 13 | ||
| 37 | #define OMAP_DMA_UART2_TX 14 | ||
| 38 | #define OMAP_DMA_UART2_RX 15 | ||
| 39 | #define OMAP_DMA_MCBSP2_TX 16 | 28 | #define OMAP_DMA_MCBSP2_TX 16 |
| 40 | #define OMAP_DMA_MCBSP2_RX 17 | 29 | #define OMAP_DMA_MCBSP2_RX 17 |
| 41 | #define OMAP_DMA_UART3_TX 18 | 30 | #define OMAP_DMA_UART3_TX 18 |
| @@ -43,41 +32,11 @@ | |||
| 43 | #define OMAP_DMA_CAMERA_IF_RX 20 | 32 | #define OMAP_DMA_CAMERA_IF_RX 20 |
| 44 | #define OMAP_DMA_MMC_TX 21 | 33 | #define OMAP_DMA_MMC_TX 21 |
| 45 | #define OMAP_DMA_MMC_RX 22 | 34 | #define OMAP_DMA_MMC_RX 22 |
| 46 | #define OMAP_DMA_NAND 23 | ||
| 47 | #define OMAP_DMA_IRQ_LCD_LINE 24 | ||
| 48 | #define OMAP_DMA_MEMORY_STICK 25 | ||
| 49 | #define OMAP_DMA_USB_W2FC_RX0 26 | 35 | #define OMAP_DMA_USB_W2FC_RX0 26 |
| 50 | #define OMAP_DMA_USB_W2FC_RX1 27 | ||
| 51 | #define OMAP_DMA_USB_W2FC_RX2 28 | ||
| 52 | #define OMAP_DMA_USB_W2FC_TX0 29 | 36 | #define OMAP_DMA_USB_W2FC_TX0 29 |
| 53 | #define OMAP_DMA_USB_W2FC_TX1 30 | ||
| 54 | #define OMAP_DMA_USB_W2FC_TX2 31 | ||
| 55 | 37 | ||
| 56 | /* These are only for 1610 */ | 38 | /* These are only for 1610 */ |
| 57 | #define OMAP_DMA_CRYPTO_DES_IN 32 | ||
| 58 | #define OMAP_DMA_SPI_TX 33 | ||
| 59 | #define OMAP_DMA_SPI_RX 34 | ||
| 60 | #define OMAP_DMA_CRYPTO_HASH 35 | ||
| 61 | #define OMAP_DMA_CCP_ATTN 36 | ||
| 62 | #define OMAP_DMA_CCP_FIFO_NOT_EMPTY 37 | ||
| 63 | #define OMAP_DMA_CMT_APE_TX_CHAN_0 38 | ||
| 64 | #define OMAP_DMA_CMT_APE_RV_CHAN_0 39 | ||
| 65 | #define OMAP_DMA_CMT_APE_TX_CHAN_1 40 | ||
| 66 | #define OMAP_DMA_CMT_APE_RV_CHAN_1 41 | ||
| 67 | #define OMAP_DMA_CMT_APE_TX_CHAN_2 42 | ||
| 68 | #define OMAP_DMA_CMT_APE_RV_CHAN_2 43 | ||
| 69 | #define OMAP_DMA_CMT_APE_TX_CHAN_3 44 | ||
| 70 | #define OMAP_DMA_CMT_APE_RV_CHAN_3 45 | ||
| 71 | #define OMAP_DMA_CMT_APE_TX_CHAN_4 46 | ||
| 72 | #define OMAP_DMA_CMT_APE_RV_CHAN_4 47 | ||
| 73 | #define OMAP_DMA_CMT_APE_TX_CHAN_5 48 | ||
| 74 | #define OMAP_DMA_CMT_APE_RV_CHAN_5 49 | ||
| 75 | #define OMAP_DMA_CMT_APE_TX_CHAN_6 50 | ||
| 76 | #define OMAP_DMA_CMT_APE_RV_CHAN_6 51 | ||
| 77 | #define OMAP_DMA_CMT_APE_TX_CHAN_7 52 | ||
| 78 | #define OMAP_DMA_CMT_APE_RV_CHAN_7 53 | ||
| 79 | #define OMAP_DMA_MMC2_TX 54 | 39 | #define OMAP_DMA_MMC2_TX 54 |
| 80 | #define OMAP_DMA_MMC2_RX 55 | 40 | #define OMAP_DMA_MMC2_RX 55 |
| 81 | #define OMAP_DMA_CRYPTO_DES_OUT 56 | ||
| 82 | 41 | ||
| 83 | #endif /* __OMAP1_DMA_CHANNEL_H */ | 42 | #endif /* __OMAP1_DMA_CHANNEL_H */ |