aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500
diff options
context:
space:
mode:
authorRabin Vincent <rabin.vincent@stericsson.com>2010-10-12 09:00:51 -0400
committerDan Williams <dan.j.williams@intel.com>2010-10-19 18:17:07 -0400
commit38bdbf020ad7ae1bca564a7db238cdf8b2f462a8 (patch)
treeee8e859322c752d4db84670fc55c707cdc59ce82 /arch/arm/mach-ux500
parent730c1871680774ea0700debc2981c7a53f51d92e (diff)
ste_dma40: move channel mode to a separate field
And keep it logical by default. Acked-by: Jonas Aaberg <jonas.aberg@stericsson.com> Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'arch/arm/mach-ux500')
-rw-r--r--arch/arm/mach-ux500/devices-db8500.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c
index 70e3d409d254..86b650b0d456 100644
--- a/arch/arm/mach-ux500/devices-db8500.c
+++ b/arch/arm/mach-ux500/devices-db8500.c
@@ -132,8 +132,8 @@ static struct resource dma40_resources[] = {
132 132
133/* Default configuration for physcial memcpy */ 133/* Default configuration for physcial memcpy */
134struct stedma40_chan_cfg dma40_memcpy_conf_phy = { 134struct stedma40_chan_cfg dma40_memcpy_conf_phy = {
135 .channel_type = (STEDMA40_CHANNEL_IN_PHY_MODE | 135 .channel_type = STEDMA40_PCHAN_BASIC_MODE,
136 STEDMA40_PCHAN_BASIC_MODE), 136 .mode = STEDMA40_MODE_PHYSICAL,
137 .dir = STEDMA40_MEM_TO_MEM, 137 .dir = STEDMA40_MEM_TO_MEM,
138 138
139 .src_info.endianess = STEDMA40_LITTLE_ENDIAN, 139 .src_info.endianess = STEDMA40_LITTLE_ENDIAN,
@@ -148,8 +148,7 @@ struct stedma40_chan_cfg dma40_memcpy_conf_phy = {
148}; 148};
149/* Default configuration for logical memcpy */ 149/* Default configuration for logical memcpy */
150struct stedma40_chan_cfg dma40_memcpy_conf_log = { 150struct stedma40_chan_cfg dma40_memcpy_conf_log = {
151 .channel_type = (STEDMA40_CHANNEL_IN_LOG_MODE | 151 .channel_type = (STEDMA40_LCHAN_SRC_LOG_DST_LOG |
152 STEDMA40_LCHAN_SRC_LOG_DST_LOG |
153 STEDMA40_NO_TIM_FOR_LINK), 152 STEDMA40_NO_TIM_FOR_LINK),
154 .dir = STEDMA40_MEM_TO_MEM, 153 .dir = STEDMA40_MEM_TO_MEM,
155 154