diff options
author | Rabin Vincent <rabin.vincent@stericsson.com> | 2010-10-12 09:00:51 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2010-10-19 18:17:07 -0400 |
commit | 38bdbf020ad7ae1bca564a7db238cdf8b2f462a8 (patch) | |
tree | ee8e859322c752d4db84670fc55c707cdc59ce82 /drivers/dma/ste_dma40.c | |
parent | 730c1871680774ea0700debc2981c7a53f51d92e (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 'drivers/dma/ste_dma40.c')
-rw-r--r-- | drivers/dma/ste_dma40.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 7bc535ee0a08..ddaeb51797b1 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c | |||
@@ -1151,8 +1151,7 @@ static int d40_validate_conf(struct d40_chan *d40c, | |||
1151 | int res = 0; | 1151 | int res = 0; |
1152 | u32 dst_event_group = D40_TYPE_TO_GROUP(conf->dst_dev_type); | 1152 | u32 dst_event_group = D40_TYPE_TO_GROUP(conf->dst_dev_type); |
1153 | u32 src_event_group = D40_TYPE_TO_GROUP(conf->src_dev_type); | 1153 | u32 src_event_group = D40_TYPE_TO_GROUP(conf->src_dev_type); |
1154 | bool is_log = (conf->channel_type & STEDMA40_CHANNEL_IN_OPER_MODE) | 1154 | bool is_log = conf->mode == STEDMA40_MODE_LOGICAL; |
1155 | == STEDMA40_CHANNEL_IN_LOG_MODE; | ||
1156 | 1155 | ||
1157 | if (!conf->dir) { | 1156 | if (!conf->dir) { |
1158 | dev_err(&d40c->chan.dev->device, "[%s] Invalid direction.\n", | 1157 | dev_err(&d40c->chan.dev->device, "[%s] Invalid direction.\n", |
@@ -1316,10 +1315,7 @@ static int d40_allocate_channel(struct d40_chan *d40c) | |||
1316 | int j; | 1315 | int j; |
1317 | int log_num; | 1316 | int log_num; |
1318 | bool is_src; | 1317 | bool is_src; |
1319 | bool is_log = (d40c->dma_cfg.channel_type & | 1318 | bool is_log = d40c->dma_cfg.mode == STEDMA40_MODE_LOGICAL; |
1320 | STEDMA40_CHANNEL_IN_OPER_MODE) | ||
1321 | == STEDMA40_CHANNEL_IN_LOG_MODE; | ||
1322 | |||
1323 | 1319 | ||
1324 | phys = d40c->base->phy_res; | 1320 | phys = d40c->base->phy_res; |
1325 | 1321 | ||