diff options
author | Rabin Vincent <rabin.vincent@stericsson.com> | 2010-10-12 09:00:54 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2010-10-19 18:17:07 -0400 |
commit | 51f5d744ed07a6b82e5cbbeeabd73605d62dcfc9 (patch) | |
tree | c9e0784f10734280277c3ab96f99917c7431432e /arch/arm | |
parent | 4a6aed3c4eb69702335ed3689132d07eabaaf86d (diff) |
ste_dma40: remove enum for endianess
A bool will suffice. The default is little endian.
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')
-rw-r--r-- | arch/arm/mach-ux500/devices-db8500.c | 4 | ||||
-rw-r--r-- | arch/arm/plat-nomadik/include/plat/ste_dma40.h | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c index d9ceddc22fc2..c04bf2b61dcd 100644 --- a/arch/arm/mach-ux500/devices-db8500.c +++ b/arch/arm/mach-ux500/devices-db8500.c | |||
@@ -135,12 +135,10 @@ struct stedma40_chan_cfg dma40_memcpy_conf_phy = { | |||
135 | .mode = STEDMA40_MODE_PHYSICAL, | 135 | .mode = STEDMA40_MODE_PHYSICAL, |
136 | .dir = STEDMA40_MEM_TO_MEM, | 136 | .dir = STEDMA40_MEM_TO_MEM, |
137 | 137 | ||
138 | .src_info.endianess = STEDMA40_LITTLE_ENDIAN, | ||
139 | .src_info.data_width = STEDMA40_BYTE_WIDTH, | 138 | .src_info.data_width = STEDMA40_BYTE_WIDTH, |
140 | .src_info.psize = STEDMA40_PSIZE_PHY_1, | 139 | .src_info.psize = STEDMA40_PSIZE_PHY_1, |
141 | .src_info.flow_ctrl = STEDMA40_NO_FLOW_CTRL, | 140 | .src_info.flow_ctrl = STEDMA40_NO_FLOW_CTRL, |
142 | 141 | ||
143 | .dst_info.endianess = STEDMA40_LITTLE_ENDIAN, | ||
144 | .dst_info.data_width = STEDMA40_BYTE_WIDTH, | 142 | .dst_info.data_width = STEDMA40_BYTE_WIDTH, |
145 | .dst_info.psize = STEDMA40_PSIZE_PHY_1, | 143 | .dst_info.psize = STEDMA40_PSIZE_PHY_1, |
146 | .dst_info.flow_ctrl = STEDMA40_NO_FLOW_CTRL, | 144 | .dst_info.flow_ctrl = STEDMA40_NO_FLOW_CTRL, |
@@ -149,12 +147,10 @@ struct stedma40_chan_cfg dma40_memcpy_conf_phy = { | |||
149 | struct stedma40_chan_cfg dma40_memcpy_conf_log = { | 147 | struct stedma40_chan_cfg dma40_memcpy_conf_log = { |
150 | .dir = STEDMA40_MEM_TO_MEM, | 148 | .dir = STEDMA40_MEM_TO_MEM, |
151 | 149 | ||
152 | .src_info.endianess = STEDMA40_LITTLE_ENDIAN, | ||
153 | .src_info.data_width = STEDMA40_BYTE_WIDTH, | 150 | .src_info.data_width = STEDMA40_BYTE_WIDTH, |
154 | .src_info.psize = STEDMA40_PSIZE_LOG_1, | 151 | .src_info.psize = STEDMA40_PSIZE_LOG_1, |
155 | .src_info.flow_ctrl = STEDMA40_NO_FLOW_CTRL, | 152 | .src_info.flow_ctrl = STEDMA40_NO_FLOW_CTRL, |
156 | 153 | ||
157 | .dst_info.endianess = STEDMA40_LITTLE_ENDIAN, | ||
158 | .dst_info.data_width = STEDMA40_BYTE_WIDTH, | 154 | .dst_info.data_width = STEDMA40_BYTE_WIDTH, |
159 | .dst_info.psize = STEDMA40_PSIZE_LOG_1, | 155 | .dst_info.psize = STEDMA40_PSIZE_LOG_1, |
160 | .dst_info.flow_ctrl = STEDMA40_NO_FLOW_CTRL, | 156 | .dst_info.flow_ctrl = STEDMA40_NO_FLOW_CTRL, |
diff --git a/arch/arm/plat-nomadik/include/plat/ste_dma40.h b/arch/arm/plat-nomadik/include/plat/ste_dma40.h index d57f37e1b7b3..07339f10d445 100644 --- a/arch/arm/plat-nomadik/include/plat/ste_dma40.h +++ b/arch/arm/plat-nomadik/include/plat/ste_dma40.h | |||
@@ -69,11 +69,6 @@ enum stedma40_flow_ctrl { | |||
69 | STEDMA40_FLOW_CTRL, | 69 | STEDMA40_FLOW_CTRL, |
70 | }; | 70 | }; |
71 | 71 | ||
72 | enum stedma40_endianess { | ||
73 | STEDMA40_LITTLE_ENDIAN, | ||
74 | STEDMA40_BIG_ENDIAN | ||
75 | }; | ||
76 | |||
77 | enum stedma40_periph_data_width { | 72 | enum stedma40_periph_data_width { |
78 | STEDMA40_BYTE_WIDTH = STEDMA40_ESIZE_8_BIT, | 73 | STEDMA40_BYTE_WIDTH = STEDMA40_ESIZE_8_BIT, |
79 | STEDMA40_HALFWORD_WIDTH = STEDMA40_ESIZE_16_BIT, | 74 | STEDMA40_HALFWORD_WIDTH = STEDMA40_ESIZE_16_BIT, |
@@ -92,13 +87,13 @@ enum stedma40_xfer_dir { | |||
92 | /** | 87 | /** |
93 | * struct stedma40_chan_cfg - dst/src channel configuration | 88 | * struct stedma40_chan_cfg - dst/src channel configuration |
94 | * | 89 | * |
95 | * @endianess: Endianess of the src/dst hardware | 90 | * @big_endian: true if the src/dst should be read as big endian |
96 | * @data_width: Data width of the src/dst hardware | 91 | * @data_width: Data width of the src/dst hardware |
97 | * @p_size: Burst size | 92 | * @p_size: Burst size |
98 | * @flow_ctrl: Flow control on/off. | 93 | * @flow_ctrl: Flow control on/off. |
99 | */ | 94 | */ |
100 | struct stedma40_half_channel_info { | 95 | struct stedma40_half_channel_info { |
101 | enum stedma40_endianess endianess; | 96 | bool big_endian; |
102 | enum stedma40_periph_data_width data_width; | 97 | enum stedma40_periph_data_width data_width; |
103 | int psize; | 98 | int psize; |
104 | enum stedma40_flow_ctrl flow_ctrl; | 99 | enum stedma40_flow_ctrl flow_ctrl; |