aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-nomadik
diff options
context:
space:
mode:
authorJonas Aaberg <jonas.aberg@stericsson.com>2010-08-09 08:08:34 -0400
committerDan Williams <dan.j.williams@intel.com>2010-09-22 17:53:46 -0400
commit767a9675c4a68ada55f0f30d629db627bd47f012 (patch)
tree00cdf68f481bc818962367b6fa3255bd8040843e /arch/arm/plat-nomadik
parentaa182ae2621877e0c111922696c84c538b82ad14 (diff)
DMAENGINE: ste_dma40: code clean-up
This patch includes non functional code clean up changes, file header updates and a few magic numbers got defined. 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.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/plat-nomadik/include/plat/ste_dma40.h b/arch/arm/plat-nomadik/include/plat/ste_dma40.h
index ee5d8b2e46dd..879a6c1ac60f 100644
--- a/arch/arm/plat-nomadik/include/plat/ste_dma40.h
+++ b/arch/arm/plat-nomadik/include/plat/ste_dma40.h
@@ -1,10 +1,8 @@
1/* 1/*
2 * arch/arm/plat-nomadik/include/plat/ste_dma40.h 2 * Copyright (C) ST-Ericsson SA 2007-2010
3 * 3 * Author: Per Friden <per.friden@stericsson.com> for ST-Ericsson
4 * Copyright (C) ST-Ericsson 2007-2010 4 * Author: Jonas Aaberg <jonas.aberg@stericsson.com> for ST-Ericsson
5 * License terms: GNU General Public License (GPL) version 2 5 * License terms: GNU General Public License (GPL) version 2
6 * Author: Per Friden <per.friden@stericsson.com>
7 * Author: Jonas Aaberg <jonas.aberg@stericsson.com>
8 */ 6 */
9 7
10 8
@@ -73,6 +71,9 @@
73#define STEDMA40_PSIZE_LOG_8 STEDMA40_PSIZE_PHY_8 71#define STEDMA40_PSIZE_LOG_8 STEDMA40_PSIZE_PHY_8
74#define STEDMA40_PSIZE_LOG_16 STEDMA40_PSIZE_PHY_16 72#define STEDMA40_PSIZE_LOG_16 STEDMA40_PSIZE_PHY_16
75 73
74/* Maximum number of possible physical channels */
75#define STEDMA40_MAX_PHYS 32
76
76enum stedma40_flow_ctrl { 77enum stedma40_flow_ctrl {
77 STEDMA40_NO_FLOW_CTRL, 78 STEDMA40_NO_FLOW_CTRL,
78 STEDMA40_FLOW_CTRL, 79 STEDMA40_FLOW_CTRL,
@@ -160,7 +161,7 @@ struct stedma40_platform_data {
160 struct stedma40_chan_cfg *memcpy_conf_phy; 161 struct stedma40_chan_cfg *memcpy_conf_phy;
161 struct stedma40_chan_cfg *memcpy_conf_log; 162 struct stedma40_chan_cfg *memcpy_conf_log;
162 unsigned int llis_per_log; 163 unsigned int llis_per_log;
163 int disabled_channels[8]; 164 int disabled_channels[STEDMA40_MAX_PHYS];
164}; 165};
165 166
166/** 167/**