OMAP2/3: DMA: implement trans copy and const fill
Subsystems (2)
PATCH 1/1 OMAP2/3: DMA: implement trans copy and const fill
Implement transparent copy and constant fill features for OMAP2/3.
Signed-off-by Tomi Valkeinen <[email protected]>
--- arch/arm/plat-omap/dma.c | 81 +++++++++++++++++++++------------ arch/arm/plat-omap/include/mach/dma.h | 1 + 2 files changed, 52 insertions(+), 30 deletions(-)
arch/arm/plat-omap/dma.c +49 -28
@@ -310,41 +310,62 @@ EXPORT_SYMBOL(omap_set_dma_transfer_params);void omap_set_dma_color_mode (int lch,enum omap_dma_color_mode mode,u32 color) { -u16 w; -BUG_ON (omap_dma_in_1510_mode ()); -if (cpu_class_is_omap2 ()) { -REVISIT_24XX (); -return ; - } +if (cpu_class_is_omap1 ()) { +u16 w; - w =dma_read (CCR2 (lch)); - w &= ~0x03 ; + w =dma_read (CCR2 (lch)); + w &= ~0x03 ; -switch (mode) { -case OMAP_DMA_CONSTANT_FILL : - w |=0x01 ; -break ; -case OMAP_DMA_TRANSPARENT_COPY : - w |=0x02 ; -break ; -case OMAP_DMA_COLOR_DIS : -break ; -default : -BUG (); +switch (mode) { +case OMAP_DMA_CONSTANT_FILL : + w |=0x01 ; +break ; +case OMAP_DMA_TRANSPARENT_COPY : + w |=0x02 ; +break ; +case OMAP_DMA_COLOR_DIS : +break ; +default : +BUG (); + } +dma_write (w,CCR2 (lch)); + + w =dma_read (LCH_CTRL (lch)); + w &= ~0x0f ; +/* Default is channel type 2D */ +if (mode) { +dma_write ((u16 )color,COLOR_L (lch)); +dma_write ((u16)(color >>16 ),COLOR_U (lch)); + w |=1 ;/* Channel type G */ + } +dma_write (w,LCH_CTRL (lch)); } -dma_write (w,CCR2 (lch)); - w =dma_read (LCH_CTRL (lch)); - w &= ~0x0f ; -/* Default is channel type 2D */ -if (mode) { -dma_write ((u16 )color,COLOR_L (lch)); -dma_write ((u16)(color >>16 ),COLOR_U (lch)); - w |=1 ;/* Channel type G */ +if (cpu_class_is_omap2 ()) { +u32 val; + + val =dma_read (CCR (lch)); + val &= ~((1 <<17 ) | (1 <<16 )); + +switch (mode) { +case OMAP_DMA_CONSTANT_FILL : + val |=1 <<16 ; +break ; +case OMAP_DMA_TRANSPARENT_COPY : + val |=1 <<17 ; +break ; +case OMAP_DMA_COLOR_DIS : +break ; +default : +BUG (); + } +dma_write (val,CCR (lch)); + + color &=0xffffff ; +dma_write (color,COLOR (lch)); } -dma_write (w,LCH_CTRL (lch)); }EXPORT_SYMBOL (omap_set_dma_color_mode);
arch/arm/plat-omap/include/mach/dma.h +1 -0
@@ -144,6 +144,7 @@#define OMAP_DMA4_CSSA_U (n) 0#define OMAP_DMA4_CDSA_L (n) 0#define OMAP_DMA4_CDSA_U (n) 0 +#define OMAP1_DMA_COLOR (n) 0/*----------------------------------------------------------------------------*/
Signature · 1 line
1.6.1.2
PATCH 1/1 OMAP2/3: DMA: implement trans copy and const fill
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Initial commit ID (Likely to change): 4d972088a40e3e51ef7ad790042b35f1cc97e35c
PatchWorks
http://patchwork.kernel.org/patch/19326/
Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=4d972088a40e3e51ef7ad790042b35f1cc97e35c