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

Commit 28cd1d17 authored by Matt Porter's avatar Matt Porter Committed by Linus Torvalds
Browse files

[PATCH] ppc32: fix ppc4xx stb03xxx dma build 



Fixes build on 4xx stb03xxx when general purpose dma engine support is
enabled.

Signed-off-by: default avatarMatt Porter <mporter@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2eaa297c

arch/ppc/syslib/ppc4xx_dma.c

+7 −3
Original line number Diff line number Diff line
@@ -620,6 +620,7 @@ ppc4xx_clr_dma_status(unsigned int dmanr) 
	return DMA_STATUS_GOOD;

}



#ifdef CONFIG_PPC4xx_EDMA

/*

 * Enables the burst on the channel (BTEN bit in the control/count register)

 * Note:
@@ -685,6 +686,11 @@ ppc4xx_set_burst_size(unsigned int dmanr, unsigned int bsize) 
	return DMA_STATUS_GOOD;

}



EXPORT_SYMBOL(ppc4xx_enable_burst);

EXPORT_SYMBOL(ppc4xx_disable_burst);

EXPORT_SYMBOL(ppc4xx_set_burst_size);

#endif /* CONFIG_PPC4xx_EDMA */



EXPORT_SYMBOL(ppc4xx_init_dma_channel);

EXPORT_SYMBOL(ppc4xx_get_channel_config);

EXPORT_SYMBOL(ppc4xx_set_channel_priority);
@@ -703,6 +709,4 @@ EXPORT_SYMBOL(ppc4xx_enable_dma_interrupt); 
EXPORT_SYMBOL(ppc4xx_disable_dma_interrupt);

EXPORT_SYMBOL(ppc4xx_get_dma_status);

EXPORT_SYMBOL(ppc4xx_clr_dma_status);

EXPORT_SYMBOL(ppc4xx_enable_burst);

EXPORT_SYMBOL(ppc4xx_disable_burst);

EXPORT_SYMBOL(ppc4xx_set_burst_size);

include/asm-ppc/ppc4xx_dma.h

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ typedef uint32_t sgl_handle_t; 


#define GET_DMA_POLARITY(chan) (DMAReq_ActiveLow(chan) | DMAAck_ActiveLow(chan) | EOT_ActiveLow(chan))



#elif defined(CONFIG_STBXXX_DMA)		/* stb03xxx */

#elif defined(CONFIG_STB03xxx)		/* stb03xxx */



#define DMA_PPC4xx_SIZE	4096