diff options
author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2010-06-20 17:26:30 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2010-06-22 21:01:56 -0400 |
commit | 8bc68fa51d7ed520cd4c69f74fb37add60b6ea47 (patch) | |
tree | 9739b68bd9f86f50c2222e49fd077a9c32559e48 | |
parent | ef934aea861323820cb39051e94a52319f456fbe (diff) |
DMAENGINE: ste_dma40: add DB8500 memcpy channels
This adds all available memcpy channels to the DB8500 in the
ux500 platform (and fixes a typo).
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
-rw-r--r-- | arch/arm/mach-ux500/devices-db8500.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ux500/ste-dma40-db8500.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c index 8d94bc673aa4..a001e4c052c2 100644 --- a/arch/arm/mach-ux500/devices-db8500.c +++ b/arch/arm/mach-ux500/devices-db8500.c | |||
@@ -177,10 +177,12 @@ static const dma_addr_t dma40_rx_map[STEDMA40_NR_DEV]; | |||
177 | 177 | ||
178 | /* Reserved event lines for memcpy only */ | 178 | /* Reserved event lines for memcpy only */ |
179 | static int dma40_memcpy_event[] = { | 179 | static int dma40_memcpy_event[] = { |
180 | STEDMA40_MEMCPY_TX_0, | ||
180 | STEDMA40_MEMCPY_TX_1, | 181 | STEDMA40_MEMCPY_TX_1, |
181 | STEDMA40_MEMCPY_TX_2, | 182 | STEDMA40_MEMCPY_TX_2, |
182 | STEDMA40_MEMCPY_TX_3, | 183 | STEDMA40_MEMCPY_TX_3, |
183 | STEDMA40_MEMCPY_TX_4, | 184 | STEDMA40_MEMCPY_TX_4, |
185 | STEDMA40_MEMCPY_TX_5, | ||
184 | }; | 186 | }; |
185 | 187 | ||
186 | static struct stedma40_platform_data dma40_plat_data = { | 188 | static struct stedma40_platform_data dma40_plat_data = { |
diff --git a/arch/arm/mach-ux500/ste-dma40-db8500.h b/arch/arm/mach-ux500/ste-dma40-db8500.h index e7016278dfa9..9d9d3797b3b0 100644 --- a/arch/arm/mach-ux500/ste-dma40-db8500.h +++ b/arch/arm/mach-ux500/ste-dma40-db8500.h | |||
@@ -136,7 +136,7 @@ enum dma_dest_dev_type { | |||
136 | STEDMA40_DEV_CAC1_TX = 48, | 136 | STEDMA40_DEV_CAC1_TX = 48, |
137 | STEDMA40_DEV_CAC1_TX_HAC1_TX = 49, | 137 | STEDMA40_DEV_CAC1_TX_HAC1_TX = 49, |
138 | STEDMA40_DEV_HAC1_TX = 50, | 138 | STEDMA40_DEV_HAC1_TX = 50, |
139 | STEDMA40_MEMXCPY_TX_0 = 51, | 139 | STEDMA40_MEMCPY_TX_0 = 51, |
140 | STEDMA40_DEV_SLIM1_CH0_TX_HSI_TX_CH4 = 52, | 140 | STEDMA40_DEV_SLIM1_CH0_TX_HSI_TX_CH4 = 52, |
141 | STEDMA40_DEV_SLIM1_CH1_TX_HSI_TX_CH5 = 53, | 141 | STEDMA40_DEV_SLIM1_CH1_TX_HSI_TX_CH5 = 53, |
142 | STEDMA40_DEV_SLIM1_CH2_TX_HSI_TX_CH6 = 54, | 142 | STEDMA40_DEV_SLIM1_CH2_TX_HSI_TX_CH6 = 54, |