Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 730c1871 authored by Rabin Vincent's avatar Rabin Vincent Committed by Dan Williams
Browse files

ste_dma40: move priority to separate field 



And keep it low priority by default.

Acked-by: default avatarJonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: default avatarRabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent ce2ca125

arch/arm/mach-ux500/devices-db8500.c

+0 −2
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ static struct resource dma40_resources[] = { 
/* Default configuration for physcial memcpy */

struct stedma40_chan_cfg dma40_memcpy_conf_phy = {

	.channel_type = (STEDMA40_CHANNEL_IN_PHY_MODE |

			 STEDMA40_LOW_PRIORITY_CHANNEL |

			 STEDMA40_PCHAN_BASIC_MODE),

	.dir = STEDMA40_MEM_TO_MEM,
@@ -150,7 +149,6 @@ struct stedma40_chan_cfg dma40_memcpy_conf_phy = { 
/* Default configuration for logical memcpy */

struct stedma40_chan_cfg dma40_memcpy_conf_log = {

	.channel_type = (STEDMA40_CHANNEL_IN_LOG_MODE |

			 STEDMA40_LOW_PRIORITY_CHANNEL |

			 STEDMA40_LCHAN_SRC_LOG_DST_LOG |

			 STEDMA40_NO_TIM_FOR_LINK),

	.dir = STEDMA40_MEM_TO_MEM,

arch/arm/plat-nomadik/include/plat/ste_dma40.h

+2 −5
Original line number Diff line number Diff line
@@ -23,11 +23,6 @@ 
 * the info structure.

 */



/* Priority */

#define STEDMA40_INFO_PRIO_TYPE_POS 2

#define STEDMA40_HIGH_PRIORITY_CHANNEL (0x1 << STEDMA40_INFO_PRIO_TYPE_POS)

#define STEDMA40_LOW_PRIORITY_CHANNEL (0x2 << STEDMA40_INFO_PRIO_TYPE_POS)



/* Mode  */

#define STEDMA40_INFO_CH_MODE_TYPE_POS 6

#define STEDMA40_CHANNEL_IN_PHY_MODE (0x1 << STEDMA40_INFO_CH_MODE_TYPE_POS)
@@ -119,6 +114,7 @@ struct stedma40_half_channel_info { 
 *

 * @dir: MEM 2 MEM, PERIPH 2 MEM , MEM 2 PERIPH, PERIPH 2 PERIPH

 * @channel_type: priority, mode, mode options and interrupt configuration.

 * @high_priority: true if high-priority

 * @src_dev_type: Src device type

 * @dst_dev_type: Dst device type

 * @src_info: Parameters for dst half channel
@@ -132,6 +128,7 @@ struct stedma40_half_channel_info { 
struct stedma40_chan_cfg {

	enum stedma40_xfer_dir			 dir;

	unsigned int				 channel_type;

	bool					 high_priority;

	int					 src_dev_type;

	int					 dst_dev_type;

	struct stedma40_half_channel_info	 src_info;

drivers/dma/ste_dma40_ll.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ void d40_phy_cfg(struct stedma40_chan_cfg *cfg, 
		src |= 1 << D40_SREG_CFG_LOG_GIM_POS;

	}



	if (cfg->channel_type & STEDMA40_HIGH_PRIORITY_CHANNEL) {

	if (cfg->high_priority) {

		src |= 1 << D40_SREG_CFG_PRI_POS;

		dst |= 1 << D40_SREG_CFG_PRI_POS;

	}