diff options
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/ipu.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/ipu.h | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/arch/arm/plat-mxc/include/mach/ipu.h b/arch/arm/plat-mxc/include/mach/ipu.h index a9221f1cc1a..f7344ab81e4 100644 --- a/arch/arm/plat-mxc/include/mach/ipu.h +++ b/arch/arm/plat-mxc/include/mach/ipu.h @@ -14,6 +14,7 @@ #include <linux/types.h> #include <linux/dmaengine.h> +#include <linux/ipu.h> /* IPU DMA Controller channel definitions. */ enum ipu_channel { @@ -95,35 +96,10 @@ enum ipu_color_space { IPU_COLORSPACE_YUV }; -/* - * Enumeration of IPU rotation modes - */ -enum ipu_rotate_mode { - /* Note the enum values correspond to BAM value */ - IPU_ROTATE_NONE = 0, - IPU_ROTATE_VERT_FLIP = 1, - IPU_ROTATE_HORIZ_FLIP = 2, - IPU_ROTATE_180 = 3, - IPU_ROTATE_90_RIGHT = 4, - IPU_ROTATE_90_RIGHT_VFLIP = 5, - IPU_ROTATE_90_RIGHT_HFLIP = 6, - IPU_ROTATE_90_LEFT = 7, -}; - struct ipu_platform_data { unsigned int irq_base; }; -/* - * Enumeration of DI ports for ADC. - */ -enum display_port { - DISP0, - DISP1, - DISP2, - DISP3 -}; - struct idmac_video_param { unsigned short in_width; unsigned short in_height; @@ -135,7 +111,7 @@ struct idmac_video_param { bool graphics_combine_en; bool global_alpha_en; bool key_color_en; - enum display_port disp; + display_port_t disp; unsigned short out_left; unsigned short out_top; }; |