diff options
-rw-r--r-- | arch/arm/mach-ux500/devices-db8500.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-nomadik/include/plat/ste_dma40.h | 7 | ||||
-rw-r--r-- | drivers/dma/ste_dma40_ll.c | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c index 58b3e723b183..70e3d409d254 100644 --- a/arch/arm/mach-ux500/devices-db8500.c +++ b/arch/arm/mach-ux500/devices-db8500.c | |||
@@ -133,7 +133,6 @@ static struct resource dma40_resources[] = { | |||
133 | /* Default configuration for physcial memcpy */ | 133 | /* Default configuration for physcial memcpy */ |
134 | struct stedma40_chan_cfg dma40_memcpy_conf_phy = { | 134 | struct stedma40_chan_cfg dma40_memcpy_conf_phy = { |
135 | .channel_type = (STEDMA40_CHANNEL_IN_PHY_MODE | | 135 | .channel_type = (STEDMA40_CHANNEL_IN_PHY_MODE | |
136 | STEDMA40_LOW_PRIORITY_CHANNEL | | ||
137 | STEDMA40_PCHAN_BASIC_MODE), | 136 | STEDMA40_PCHAN_BASIC_MODE), |
138 | .dir = STEDMA40_MEM_TO_MEM, | 137 | .dir = STEDMA40_MEM_TO_MEM, |
139 | 138 | ||
@@ -150,7 +149,6 @@ struct stedma40_chan_cfg dma40_memcpy_conf_phy = { | |||
150 | /* Default configuration for logical memcpy */ | 149 | /* Default configuration for logical memcpy */ |
151 | struct stedma40_chan_cfg dma40_memcpy_conf_log = { | 150 | struct stedma40_chan_cfg dma40_memcpy_conf_log = { |
152 | .channel_type = (STEDMA40_CHANNEL_IN_LOG_MODE | | 151 | .channel_type = (STEDMA40_CHANNEL_IN_LOG_MODE | |
153 | STEDMA40_LOW_PRIORITY_CHANNEL | | ||
154 | STEDMA40_LCHAN_SRC_LOG_DST_LOG | | 152 | STEDMA40_LCHAN_SRC_LOG_DST_LOG | |
155 | STEDMA40_NO_TIM_FOR_LINK), | 153 | STEDMA40_NO_TIM_FOR_LINK), |
156 | .dir = STEDMA40_MEM_TO_MEM, | 154 | .dir = STEDMA40_MEM_TO_MEM, |
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 { | |||
132 | struct stedma40_chan_cfg { | 128 | struct 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; |
diff --git a/drivers/dma/ste_dma40_ll.c b/drivers/dma/ste_dma40_ll.c index 86a306dbe1b4..cfc86a56d66f 100644 --- a/drivers/dma/ste_dma40_ll.c +++ b/drivers/dma/ste_dma40_ll.c | |||
@@ -108,7 +108,7 @@ void d40_phy_cfg(struct stedma40_chan_cfg *cfg, | |||
108 | src |= 1 << D40_SREG_CFG_LOG_GIM_POS; | 108 | src |= 1 << D40_SREG_CFG_LOG_GIM_POS; |
109 | } | 109 | } |
110 | 110 | ||
111 | if (cfg->channel_type & STEDMA40_HIGH_PRIORITY_CHANNEL) { | 111 | if (cfg->high_priority) { |
112 | src |= 1 << D40_SREG_CFG_PRI_POS; | 112 | src |= 1 << D40_SREG_CFG_PRI_POS; |
113 | dst |= 1 << D40_SREG_CFG_PRI_POS; | 113 | dst |= 1 << D40_SREG_CFG_PRI_POS; |
114 | } | 114 | } |