aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-nomadik
diff options
context:
space:
mode:
authorRabin Vincent <rabin.vincent@stericsson.com>2010-10-12 09:00:50 -0400
committerDan Williams <dan.j.williams@intel.com>2010-10-19 18:17:06 -0400
commit730c1871680774ea0700debc2981c7a53f51d92e (patch)
tree0d3db14d2e241d060c749c183ffa124da4f946fc /arch/arm/plat-nomadik
parentce2ca1252ba8688a4997b4104793540f4c28c0d8 (diff)
ste_dma40: move priority to separate field
And keep it low priority 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.h7
1 files changed, 2 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 3dd42551de04..9adcd9b3e293 100644
--- a/arch/arm/plat-nomadik/include/plat/ste_dma40.h
+++ b/arch/arm/plat-nomadik/include/plat/ste_dma40.h
@@ -23,11 +23,6 @@
23 * the info structure. 23 * the info structure.
24 */ 24 */
25 25
26/* Priority */
27#define STEDMA40_INFO_PRIO_TYPE_POS 2
28#define STEDMA40_HIGH_PRIORITY_CHANNEL (0x1 << STEDMA40_INFO_PRIO_TYPE_POS)
29#define STEDMA40_LOW_PRIORITY_CHANNEL (0x2 << STEDMA40_INFO_PRIO_TYPE_POS)
30
31/* Mode */ 26/* Mode */
32#define STEDMA40_INFO_CH_MODE_TYPE_POS 6 27#define STEDMA40_INFO_CH_MODE_TYPE_POS 6
33#define STEDMA40_CHANNEL_IN_PHY_MODE (0x1 << STEDMA40_INFO_CH_MODE_TYPE_POS) 28#define STEDMA40_CHANNEL_IN_PHY_MODE (0x1 << STEDMA40_INFO_CH_MODE_TYPE_POS)
@@ -119,6 +114,7 @@ struct stedma40_half_channel_info {
119 * 114 *
120 * @dir: MEM 2 MEM, PERIPH 2 MEM , MEM 2 PERIPH, PERIPH 2 PERIPH 115 * @dir: MEM 2 MEM, PERIPH 2 MEM , MEM 2 PERIPH, PERIPH 2 PERIPH
121 * @channel_type: priority, mode, mode options and interrupt configuration. 116 * @channel_type: priority, mode, mode options and interrupt configuration.
117 * @high_priority: true if high-priority
122 * @src_dev_type: Src device type 118 * @src_dev_type: Src device type
123 * @dst_dev_type: Dst device type 119 * @dst_dev_type: Dst device type
124 * @src_info: Parameters for dst half channel 120 * @src_info: Parameters for dst half channel
@@ -132,6 +128,7 @@ struct stedma40_half_channel_info {
132struct stedma40_chan_cfg { 128struct stedma40_chan_cfg {
133 enum stedma40_xfer_dir dir; 129 enum stedma40_xfer_dir dir;
134 unsigned int channel_type; 130 unsigned int channel_type;
131 bool high_priority;
135 int src_dev_type; 132 int src_dev_type;
136 int dst_dev_type; 133 int dst_dev_type;
137 struct stedma40_half_channel_info src_info; 134 struct stedma40_half_channel_info src_info;