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

Commit b2b54c9f authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Arnd Bergmann
Browse files

arm: ep93xx: add dma_masks for the M2P and M2M DMA controllers 



The dma_mask and coherent_dma_mask need to be set or DMA memory allocations
will fail with error messages like this:

  ep93xx-dma ep93xx-dma-m2p: coherent DMA mask is unset

  ep93xx-dma ep93xx-dma-m2m: coherent DMA mask is unset

Add the missing information to the ep93xx-dma-m2p and ep93xx-dma-m2m
devices.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reported-by: default avatarJeremy Moles <cubicool@gmail.com>
Tested-by: default avatarAlexander Sverdlin <subaparts@yandex.ru>
Cc: Ryan Mallon <rmallon@gmail.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent daac6f86

arch/arm/mach-ep93xx/dma.c

+10 −2
Original line number Diff line number Diff line
@@ -66,11 +66,15 @@ static struct ep93xx_dma_platform_data ep93xx_dma_m2p_data = { 
	.num_channels		= ARRAY_SIZE(ep93xx_dma_m2p_channels),

};



static u64 ep93xx_dma_m2p_mask = DMA_BIT_MASK(32);



static struct platform_device ep93xx_dma_m2p_device = {

	.name			= "ep93xx-dma-m2p",

	.id			= -1,

	.dev			= {

		.platform_data		= &ep93xx_dma_m2p_data,

		.dma_mask		= &ep93xx_dma_m2p_mask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	},

};
@@ -93,11 +97,15 @@ static struct ep93xx_dma_platform_data ep93xx_dma_m2m_data = { 
	.num_channels		= ARRAY_SIZE(ep93xx_dma_m2m_channels),

};



static u64 ep93xx_dma_m2m_mask = DMA_BIT_MASK(32);



static struct platform_device ep93xx_dma_m2m_device = {

	.name			= "ep93xx-dma-m2m",

	.id			= -1,

	.dev			= {

		.platform_data		= &ep93xx_dma_m2m_data,

		.dma_mask		= &ep93xx_dma_m2m_mask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	},

};