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

Commit 38bdbf02 authored by Rabin Vincent's avatar Rabin Vincent Committed by Dan Williams
Browse files

ste_dma40: move channel mode to a separate field 



And keep it logical 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 730c1871

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

+3 −4
Original line number Original line Diff line number Diff line
@@ -132,8 +132,8 @@ static struct resource dma40_resources[] = { 




/* Default configuration for physcial memcpy */

/* Default configuration for physcial memcpy */

struct stedma40_chan_cfg dma40_memcpy_conf_phy = {

struct stedma40_chan_cfg dma40_memcpy_conf_phy = {

	.channel_type = (STEDMA40_CHANNEL_IN_PHY_MODE |

	.channel_type = STEDMA40_PCHAN_BASIC_MODE,

			 STEDMA40_PCHAN_BASIC_MODE),

	.mode = STEDMA40_MODE_PHYSICAL,

	.dir = STEDMA40_MEM_TO_MEM,

	.dir = STEDMA40_MEM_TO_MEM,





	.src_info.endianess = STEDMA40_LITTLE_ENDIAN,

	.src_info.endianess = STEDMA40_LITTLE_ENDIAN,
@@ -148,8 +148,7 @@ struct stedma40_chan_cfg dma40_memcpy_conf_phy = { 
};

};

/* Default configuration for logical memcpy */

/* Default configuration for logical memcpy */

struct stedma40_chan_cfg dma40_memcpy_conf_log = {

struct stedma40_chan_cfg dma40_memcpy_conf_log = {

	.channel_type = (STEDMA40_CHANNEL_IN_LOG_MODE |

	.channel_type = (STEDMA40_LCHAN_SRC_LOG_DST_LOG |

			 STEDMA40_LCHAN_SRC_LOG_DST_LOG |

			 STEDMA40_NO_TIM_FOR_LINK),

			 STEDMA40_NO_TIM_FOR_LINK),

	.dir = STEDMA40_MEM_TO_MEM,

	.dir = STEDMA40_MEM_TO_MEM,

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

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

 * the info structure.

 */

 */





/* Mode  */

enum stedma40_mode {

#define STEDMA40_INFO_CH_MODE_TYPE_POS 6

	STEDMA40_MODE_LOGICAL = 0,

#define STEDMA40_CHANNEL_IN_PHY_MODE (0x1 << STEDMA40_INFO_CH_MODE_TYPE_POS)

	STEDMA40_MODE_PHYSICAL,

#define STEDMA40_CHANNEL_IN_LOG_MODE (0x2 << STEDMA40_INFO_CH_MODE_TYPE_POS)

	STEDMA40_MODE_OPERATION,

#define STEDMA40_CHANNEL_IN_OPER_MODE (0x3 << STEDMA40_INFO_CH_MODE_TYPE_POS)

};





/* Mode options */

/* Mode options */

#define STEDMA40_INFO_CH_MODE_OPT_POS 8

#define STEDMA40_INFO_CH_MODE_OPT_POS 8
@@ -115,6 +115,7 @@ struct stedma40_half_channel_info { 
 * @dir: MEM 2 MEM, PERIPH 2 MEM , MEM 2 PERIPH, PERIPH 2 PERIPH

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

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

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

 * @high_priority: true if high-priority

 * @high_priority: true if high-priority

 * @mode: channel mode: physical, logical, or operation

 * @src_dev_type: Src device type

 * @src_dev_type: Src device type

 * @dst_dev_type: Dst device type

 * @dst_dev_type: Dst device type

 * @src_info: Parameters for dst half channel

 * @src_info: Parameters for dst half channel
@@ -129,6 +130,7 @@ struct stedma40_chan_cfg { 
	enum stedma40_xfer_dir			 dir;

	enum stedma40_xfer_dir			 dir;

	unsigned int				 channel_type;

	unsigned int				 channel_type;

	bool					 high_priority;

	bool					 high_priority;

	enum stedma40_mode			 mode;

	int					 src_dev_type;

	int					 src_dev_type;

	int					 dst_dev_type;

	int					 dst_dev_type;

	struct stedma40_half_channel_info	 src_info;

	struct stedma40_half_channel_info	 src_info;

drivers/dma/ste_dma40.c

+2 −6
Original line number Original line Diff line number Diff line
@@ -1151,8 +1151,7 @@ static int d40_validate_conf(struct d40_chan *d40c, 
	int res = 0;

	int res = 0;

	u32 dst_event_group = D40_TYPE_TO_GROUP(conf->dst_dev_type);

	u32 dst_event_group = D40_TYPE_TO_GROUP(conf->dst_dev_type);

	u32 src_event_group = D40_TYPE_TO_GROUP(conf->src_dev_type);

	u32 src_event_group = D40_TYPE_TO_GROUP(conf->src_dev_type);

	bool is_log = (conf->channel_type & STEDMA40_CHANNEL_IN_OPER_MODE)

	bool is_log = conf->mode == STEDMA40_MODE_LOGICAL;

		== STEDMA40_CHANNEL_IN_LOG_MODE;





	if (!conf->dir) {

	if (!conf->dir) {

		dev_err(&d40c->chan.dev->device, "[%s] Invalid direction.\n",

		dev_err(&d40c->chan.dev->device, "[%s] Invalid direction.\n",
@@ -1316,10 +1315,7 @@ static int d40_allocate_channel(struct d40_chan *d40c) 
	int j;

	int j;

	int log_num;

	int log_num;

	bool is_src;

	bool is_src;

	bool is_log = (d40c->dma_cfg.channel_type &

	bool is_log = d40c->dma_cfg.mode == STEDMA40_MODE_LOGICAL;

		       STEDMA40_CHANNEL_IN_OPER_MODE)

		== STEDMA40_CHANNEL_IN_LOG_MODE;







	phys = d40c->base->phy_res;

	phys = d40c->base->phy_res;