diff options
author | Ola Lilja <ola.o.lilja@stericsson.com> | 2012-01-30 09:18:22 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-02-29 10:32:36 -0500 |
commit | f629a7aef8424448758edfce36a810434227f070 (patch) | |
tree | 2b5a54341d9850368c25aac19c6d91ae9a4b925f | |
parent | 25cb3b4cf0ac65565384d10110ffa36018d83792 (diff) |
ARM: ux500: Add DMA-channels for MSP
Add DMA-channels for MSP0, MSP1, MSP2 and MSP3.
Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r-- | arch/arm/mach-ux500/devices-db8500.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-ux500/include/mach/hardware.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c index a7c6cdc9b11e..6e66d3777ed5 100644 --- a/arch/arm/mach-ux500/devices-db8500.c +++ b/arch/arm/mach-ux500/devices-db8500.c | |||
@@ -101,6 +101,9 @@ static const dma_addr_t dma40_tx_map[DB8500_DMA_NR_DEV] = { | |||
101 | [DB8500_DMA_DEV41_SD_MM3_TX] = -1, | 101 | [DB8500_DMA_DEV41_SD_MM3_TX] = -1, |
102 | [DB8500_DMA_DEV42_SD_MM4_TX] = -1, | 102 | [DB8500_DMA_DEV42_SD_MM4_TX] = -1, |
103 | [DB8500_DMA_DEV43_SD_MM5_TX] = -1, | 103 | [DB8500_DMA_DEV43_SD_MM5_TX] = -1, |
104 | [DB8500_DMA_DEV14_MSP2_TX] = U8500_MSP2_BASE + MSP_TX_RX_REG_OFFSET, | ||
105 | [DB8500_DMA_DEV30_MSP1_TX] = U8500_MSP1_BASE + MSP_TX_RX_REG_OFFSET, | ||
106 | [DB8500_DMA_DEV31_MSP0_TX_SLIM0_CH0_TX] = U8500_MSP0_BASE + MSP_TX_RX_REG_OFFSET, | ||
104 | }; | 107 | }; |
105 | 108 | ||
106 | /* Mapping between source event lines and physical device address */ | 109 | /* Mapping between source event lines and physical device address */ |
@@ -133,6 +136,9 @@ static const dma_addr_t dma40_rx_map[DB8500_DMA_NR_DEV] = { | |||
133 | [DB8500_DMA_DEV41_SD_MM3_RX] = -1, | 136 | [DB8500_DMA_DEV41_SD_MM3_RX] = -1, |
134 | [DB8500_DMA_DEV42_SD_MM4_RX] = -1, | 137 | [DB8500_DMA_DEV42_SD_MM4_RX] = -1, |
135 | [DB8500_DMA_DEV43_SD_MM5_RX] = -1, | 138 | [DB8500_DMA_DEV43_SD_MM5_RX] = -1, |
139 | [DB8500_DMA_DEV14_MSP2_RX] = U8500_MSP2_BASE + MSP_TX_RX_REG_OFFSET, | ||
140 | [DB8500_DMA_DEV30_MSP3_RX] = U8500_MSP3_BASE + MSP_TX_RX_REG_OFFSET, | ||
141 | [DB8500_DMA_DEV31_MSP0_RX_SLIM0_CH0_RX] = U8500_MSP0_BASE + MSP_TX_RX_REG_OFFSET, | ||
136 | }; | 142 | }; |
137 | 143 | ||
138 | /* Reserved event lines for memcpy only */ | 144 | /* Reserved event lines for memcpy only */ |
diff --git a/arch/arm/mach-ux500/include/mach/hardware.h b/arch/arm/mach-ux500/include/mach/hardware.h index b6ba26a1367d..d93d6dbef25b 100644 --- a/arch/arm/mach-ux500/include/mach/hardware.h +++ b/arch/arm/mach-ux500/include/mach/hardware.h | |||
@@ -30,6 +30,8 @@ | |||
30 | #include <mach/db8500-regs.h> | 30 | #include <mach/db8500-regs.h> |
31 | #include <mach/db5500-regs.h> | 31 | #include <mach/db5500-regs.h> |
32 | 32 | ||
33 | #define MSP_TX_RX_REG_OFFSET 0 | ||
34 | |||
33 | #ifndef __ASSEMBLY__ | 35 | #ifndef __ASSEMBLY__ |
34 | 36 | ||
35 | #include <mach/id.h> | 37 | #include <mach/id.h> |