aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-nomadik
diff options
context:
space:
mode:
authorJonas Aaberg <jonas.aberg@stericsson.com>2010-06-20 17:26:45 -0400
committerDan Williams <dan.j.williams@intel.com>2010-06-22 21:01:57 -0400
commit595167253a20167efae704ff2a8f6e2ee66cf25f (patch)
tree83c4ad1ab55b3dcea7855d6b8121af18fb7f5a0f /arch/arm/plat-nomadik
parentd181b3a8cb2fc1732ad1826a5e6fdccab03e6a51 (diff)
DMAENGINE: ste_dma40: no disabled phy channels on ux500
Make sure we have no disabled physical channels when we start on the ux500 machines. Signed-off-by: Jonas Aaberg <jonas.aberg@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.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/plat-nomadik/include/plat/ste_dma40.h b/arch/arm/plat-nomadik/include/plat/ste_dma40.h
index 4d12ea4ca361..5fbde4b8dc12 100644
--- a/arch/arm/plat-nomadik/include/plat/ste_dma40.h
+++ b/arch/arm/plat-nomadik/include/plat/ste_dma40.h
@@ -148,7 +148,8 @@ struct stedma40_chan_cfg {
148 * @memcpy_conf_phy: default configuration of physical channel memcpy 148 * @memcpy_conf_phy: default configuration of physical channel memcpy
149 * @memcpy_conf_log: default configuration of logical channel memcpy 149 * @memcpy_conf_log: default configuration of logical channel memcpy
150 * @llis_per_log: number of max linked list items per logical channel 150 * @llis_per_log: number of max linked list items per logical channel
151 * 151 * @disabled_channels: A vector, ending with -1, that marks physical channels
152 * that are for different reasons not available for the driver.
152 */ 153 */
153struct stedma40_platform_data { 154struct stedma40_platform_data {
154 u32 dev_len; 155 u32 dev_len;
@@ -159,6 +160,7 @@ struct stedma40_platform_data {
159 struct stedma40_chan_cfg *memcpy_conf_phy; 160 struct stedma40_chan_cfg *memcpy_conf_phy;
160 struct stedma40_chan_cfg *memcpy_conf_log; 161 struct stedma40_chan_cfg *memcpy_conf_log;
161 unsigned int llis_per_log; 162 unsigned int llis_per_log;
163 int disabled_channels[8];
162}; 164};
163 165
164/** 166/**