diff options
| author | Rabin Vincent <rabin.vincent@stericsson.com> | 2010-10-12 13:00:51 +0000 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-10-19 15:17:07 -0700 |
| commit | 38bdbf020ad7ae1bca564a7db238cdf8b2f462a8 (patch) | |
| tree | ee8e859322c752d4db84670fc55c707cdc59ce82 /arch/arm/plat-nomadik | |
| 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 'arch/arm/plat-nomadik')
| -rw-r--r-- | arch/arm/plat-nomadik/include/plat/ste_dma40.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/plat-nomadik/include/plat/ste_dma40.h b/arch/arm/plat-nomadik/include/plat/ste_dma40.h index 9adcd9b3e29..e49a2a11592 100644 --- a/arch/arm/plat-nomadik/include/plat/ste_dma40.h +++ b/arch/arm/plat-nomadik/include/plat/ste_dma40.h @@ -23,11 +23,11 @@ * the info structure. */ -/* Mode */ -#define STEDMA40_INFO_CH_MODE_TYPE_POS 6 -#define STEDMA40_CHANNEL_IN_PHY_MODE (0x1 << STEDMA40_INFO_CH_MODE_TYPE_POS) -#define STEDMA40_CHANNEL_IN_LOG_MODE (0x2 << STEDMA40_INFO_CH_MODE_TYPE_POS) -#define STEDMA40_CHANNEL_IN_OPER_MODE (0x3 << STEDMA40_INFO_CH_MODE_TYPE_POS) +enum stedma40_mode { + STEDMA40_MODE_LOGICAL = 0, + STEDMA40_MODE_PHYSICAL, + STEDMA40_MODE_OPERATION, +}; /* Mode options */ #define STEDMA40_INFO_CH_MODE_OPT_POS 8 @@ -115,6 +115,7 @@ struct stedma40_half_channel_info { * @dir: MEM 2 MEM, PERIPH 2 MEM , MEM 2 PERIPH, PERIPH 2 PERIPH * @channel_type: priority, mode, mode options and interrupt configuration. * @high_priority: true if high-priority + * @mode: channel mode: physical, logical, or operation * @src_dev_type: Src device type * @dst_dev_type: Dst device type * @src_info: Parameters for dst half channel @@ -129,6 +130,7 @@ struct stedma40_chan_cfg { enum stedma40_xfer_dir dir; unsigned int channel_type; bool high_priority; + enum stedma40_mode mode; int src_dev_type; int dst_dev_type; struct stedma40_half_channel_info src_info; |