diff options
author | Rabin Vincent <rabin.vincent@stericsson.com> | 2010-10-12 09:00:55 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2010-10-19 18:17:07 -0400 |
commit | 5c3720935813c45c2893fdb53eb6f73f1aee93c7 (patch) | |
tree | ef7fd415ac6f583456c4327d14334ffb3abe35c9 /arch/arm/plat-nomadik | |
parent | 51f5d744ed07a6b82e5cbbeeabd73605d62dcfc9 (diff) |
ste_dma40: remove channel_type
It has been replaced with separate fields.
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 | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/plat-nomadik/include/plat/ste_dma40.h b/arch/arm/plat-nomadik/include/plat/ste_dma40.h index 07339f10d445..da1f08ff9ee2 100644 --- a/arch/arm/plat-nomadik/include/plat/ste_dma40.h +++ b/arch/arm/plat-nomadik/include/plat/ste_dma40.h | |||
@@ -18,11 +18,6 @@ | |||
18 | #define STEDMA40_DEV_DST_MEMORY (-1) | 18 | #define STEDMA40_DEV_DST_MEMORY (-1) |
19 | #define STEDMA40_DEV_SRC_MEMORY (-1) | 19 | #define STEDMA40_DEV_SRC_MEMORY (-1) |
20 | 20 | ||
21 | /* | ||
22 | * Description of bitfields of channel_type variable is available in | ||
23 | * the info structure. | ||
24 | */ | ||
25 | |||
26 | enum stedma40_mode { | 21 | enum stedma40_mode { |
27 | STEDMA40_MODE_LOGICAL = 0, | 22 | STEDMA40_MODE_LOGICAL = 0, |
28 | STEDMA40_MODE_PHYSICAL, | 23 | STEDMA40_MODE_PHYSICAL, |
@@ -38,8 +33,6 @@ enum stedma40_mode_opt { | |||
38 | STEDMA40_LCHAN_SRC_LOG_DST_PHY, | 33 | STEDMA40_LCHAN_SRC_LOG_DST_PHY, |
39 | }; | 34 | }; |
40 | 35 | ||
41 | /* End of channel_type configuration */ | ||
42 | |||
43 | #define STEDMA40_ESIZE_8_BIT 0x0 | 36 | #define STEDMA40_ESIZE_8_BIT 0x0 |
44 | #define STEDMA40_ESIZE_16_BIT 0x1 | 37 | #define STEDMA40_ESIZE_16_BIT 0x1 |
45 | #define STEDMA40_ESIZE_32_BIT 0x2 | 38 | #define STEDMA40_ESIZE_32_BIT 0x2 |
@@ -103,7 +96,6 @@ struct stedma40_half_channel_info { | |||
103 | * struct stedma40_chan_cfg - Structure to be filled by client drivers. | 96 | * struct stedma40_chan_cfg - Structure to be filled by client drivers. |
104 | * | 97 | * |
105 | * @dir: MEM 2 MEM, PERIPH 2 MEM , MEM 2 PERIPH, PERIPH 2 PERIPH | 98 | * @dir: MEM 2 MEM, PERIPH 2 MEM , MEM 2 PERIPH, PERIPH 2 PERIPH |
106 | * @channel_type: priority, mode, mode options and interrupt configuration. | ||
107 | * @high_priority: true if high-priority | 99 | * @high_priority: true if high-priority |
108 | * @mode: channel mode: physical, logical, or operation | 100 | * @mode: channel mode: physical, logical, or operation |
109 | * @mode_opt: options for the chosen channel mode | 101 | * @mode_opt: options for the chosen channel mode |
@@ -119,7 +111,6 @@ struct stedma40_half_channel_info { | |||
119 | */ | 111 | */ |
120 | struct stedma40_chan_cfg { | 112 | struct stedma40_chan_cfg { |
121 | enum stedma40_xfer_dir dir; | 113 | enum stedma40_xfer_dir dir; |
122 | unsigned int channel_type; | ||
123 | bool high_priority; | 114 | bool high_priority; |
124 | enum stedma40_mode mode; | 115 | enum stedma40_mode mode; |
125 | enum stedma40_mode_opt mode_opt; | 116 | enum stedma40_mode_opt mode_opt; |