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

Commit 29027a1e authored by Lee Jones's avatar Lee Jones Committed by Linus Walleij
Browse files

dmaengine: ste_dma40: Move default memcpy configs into the driver 



There are only two default memcpy configurations used for the DMA40
driver; one for physical memcpy and one for logical memcpy. Instead
of invariably passing the same configurations though platform data,
we're moving them into the driver instead.

Acked-by: default avatarVinod Koul <vnod.koul@intel.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent a2acaa21

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

+0 −28
Original line number Diff line number Diff line
@@ -42,32 +42,6 @@ static struct resource dma40_resources[] = { 
	}

};



/* Default configuration for physcial memcpy */

struct stedma40_chan_cfg dma40_memcpy_conf_phy = {

	.mode = STEDMA40_MODE_PHYSICAL,

	.dir = STEDMA40_MEM_TO_MEM,



	.src_info.data_width = STEDMA40_BYTE_WIDTH,

	.src_info.psize = STEDMA40_PSIZE_PHY_1,

	.src_info.flow_ctrl = STEDMA40_NO_FLOW_CTRL,



	.dst_info.data_width = STEDMA40_BYTE_WIDTH,

	.dst_info.psize = STEDMA40_PSIZE_PHY_1,

	.dst_info.flow_ctrl = STEDMA40_NO_FLOW_CTRL,

};

/* Default configuration for logical memcpy */

struct stedma40_chan_cfg dma40_memcpy_conf_log = {

	.dir = STEDMA40_MEM_TO_MEM,



	.src_info.data_width = STEDMA40_BYTE_WIDTH,

	.src_info.psize = STEDMA40_PSIZE_LOG_1,

	.src_info.flow_ctrl = STEDMA40_NO_FLOW_CTRL,



	.dst_info.data_width = STEDMA40_BYTE_WIDTH,

	.dst_info.psize = STEDMA40_PSIZE_LOG_1,

	.dst_info.flow_ctrl = STEDMA40_NO_FLOW_CTRL,

};



/*

 * Mapping between destination event lines and physical device address.

 * The event line is tied to a device and therefore the address is constant.
@@ -150,8 +124,6 @@ static struct stedma40_platform_data dma40_plat_data = { 
	.dev_len = DB8500_DMA_NR_DEV,

	.dev_rx = dma40_rx_map,

	.dev_tx = dma40_tx_map,

	.memcpy_conf_phy = &dma40_memcpy_conf_phy,

	.memcpy_conf_log = &dma40_memcpy_conf_log,

	.disabled_channels = {-1},

};

drivers/dma/ste_dma40.c

+30 −2
Original line number Diff line number Diff line
@@ -72,6 +72,34 @@ static int dma40_memcpy_channels[] = { 
	DB8500_DMA_MEMCPY_EV_5,

};



/* Default configuration for physcial memcpy */

struct stedma40_chan_cfg dma40_memcpy_conf_phy = {

	.mode = STEDMA40_MODE_PHYSICAL,

	.dir = STEDMA40_MEM_TO_MEM,



	.src_info.data_width = STEDMA40_BYTE_WIDTH,

	.src_info.psize = STEDMA40_PSIZE_PHY_1,

	.src_info.flow_ctrl = STEDMA40_NO_FLOW_CTRL,



	.dst_info.data_width = STEDMA40_BYTE_WIDTH,

	.dst_info.psize = STEDMA40_PSIZE_PHY_1,

	.dst_info.flow_ctrl = STEDMA40_NO_FLOW_CTRL,

};



/* Default configuration for logical memcpy */

struct stedma40_chan_cfg dma40_memcpy_conf_log = {

	.mode = STEDMA40_MODE_LOGICAL,

	.dir = STEDMA40_MEM_TO_MEM,



	.src_info.data_width = STEDMA40_BYTE_WIDTH,

	.src_info.psize = STEDMA40_PSIZE_LOG_1,

	.src_info.flow_ctrl = STEDMA40_NO_FLOW_CTRL,



	.dst_info.data_width = STEDMA40_BYTE_WIDTH,

	.dst_info.psize = STEDMA40_PSIZE_LOG_1,

	.dst_info.flow_ctrl = STEDMA40_NO_FLOW_CTRL,

};



/**

 * enum 40_command - The different commands and/or statuses.

 *
@@ -2029,13 +2057,13 @@ static int d40_config_memcpy(struct d40_chan *d40c) 
	dma_cap_mask_t cap = d40c->chan.device->cap_mask;



	if (dma_has_cap(DMA_MEMCPY, cap) && !dma_has_cap(DMA_SLAVE, cap)) {

		d40c->dma_cfg = *d40c->base->plat_data->memcpy_conf_log;

		d40c->dma_cfg = dma40_memcpy_conf_log;

		d40c->dma_cfg.src_dev_type = STEDMA40_DEV_SRC_MEMORY;

		d40c->dma_cfg.dst_dev_type = dma40_memcpy_channels[d40c->chan.chan_id];



	} else if (dma_has_cap(DMA_MEMCPY, cap) &&

		   dma_has_cap(DMA_SLAVE, cap)) {

		d40c->dma_cfg = *d40c->base->plat_data->memcpy_conf_phy;

		d40c->dma_cfg = dma40_memcpy_conf_phy;

	} else {

		chan_err(d40c, "No memcpy\n");

		return -EINVAL;

include/linux/platform_data/dma-ste-dma40.h

+0 −4
Original line number Diff line number Diff line
@@ -141,8 +141,6 @@ struct stedma40_chan_cfg { 
 * @dev_len: length of dev_tx and dev_rx

 * @dev_tx: mapping between destination event line and io address

 * @dev_rx: mapping between source event line and io address

 * @memcpy_conf_phy: default configuration of physical channel memcpy

 * @memcpy_conf_log: default configuration of logical channel memcpy

 * @disabled_channels: A vector, ending with -1, that marks physical channels

 * that are for different reasons not available for the driver.

 * @soft_lli_chans: A vector, that marks physical channels will use LLI by SW
@@ -160,8 +158,6 @@ struct stedma40_platform_data { 
	u32				 dev_len;

	const dma_addr_t		*dev_tx;

	const dma_addr_t		*dev_rx;

	struct stedma40_chan_cfg	*memcpy_conf_phy;

	struct stedma40_chan_cfg	*memcpy_conf_log;

	int				 disabled_channels[STEDMA40_MAX_PHYS];

	int				*soft_lli_chans;

	int				 num_of_soft_lli_chans;