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

Commit 59516725 authored by Jonas Aaberg's avatar Jonas Aaberg Committed by Dan Williams
Browse files

DMAENGINE: ste_dma40: no disabled phy channels on ux500 



Make sure we have no disabled physical channels when we start on
the ux500 machines.

Signed-off-by: default avatarJonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent d181b3a8

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

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ static struct stedma40_platform_data dma40_plat_data = { 
	.memcpy_conf_phy = &dma40_memcpy_conf_phy,

	.memcpy_conf_log = &dma40_memcpy_conf_log,

	.llis_per_log = 8,

	.disabled_channels = {-1},

};



struct platform_device u8500_dma40_device = {

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

+3 −1
Original line number Diff line number Diff line
@@ -148,7 +148,8 @@ struct stedma40_chan_cfg { 
 * @memcpy_conf_phy: default configuration of physical channel memcpy

 * @memcpy_conf_log: default configuration of logical channel memcpy

 * @llis_per_log: number of max linked list items per logical channel

 *

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

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

 */

struct stedma40_platform_data {

	u32				 dev_len;
@@ -159,6 +160,7 @@ struct stedma40_platform_data { 
	struct stedma40_chan_cfg	*memcpy_conf_phy;

	struct stedma40_chan_cfg	*memcpy_conf_log;

	unsigned int			 llis_per_log;

	int				 disabled_channels[8];

};



/**