diff options
author | guoyin.chen <guoyin.chen@freescale.com> | 2013-02-27 13:32:17 +0800 |
---|---|---|
committer | guoyin.chen <guoyin.chen@freescale.com> | 2013-02-27 13:32:17 +0800 |
commit | 66c3a24a57bd9e721f5d0d45924c3c250bb37770 (patch) | |
tree | 5c467232e149c887a847cedb1cf762a6a6940924 /include | |
parent | 57ee456c6db3bb07b4725b234ac0a4aefd1c80e1 (diff) | |
parent | 85b80e70a92ad66b86dc0a1636c59145b9fbf39c (diff) |
Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35' into imx_3.0.35_android
Conflicts:
arch/arm/mach-mx6/Makefile
arch/arm/mach-mx6/board-mx6dl_hdmidongle.h
arch/arm/mach-mx6/board-mx6q_hdmidongle.c
arch/arm/mach-mx6/board-mx6q_hdmidongle.h
arch/arm/mach-mx6/board-mx6q_sabreauto.c
arch/arm/mach-mx6/board-mx6q_sabrelite.c
drivers/media/video/mxc/capture/csi_v4l2_capture.c
drivers/media/video/mxc/capture/ipu_csi_enc.c
drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c
drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c
drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h
drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h
drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h
drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h
drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h
drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c
drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c
drivers/mxc/vpu/mxc_vpu.c
drivers/usb/gadget/arcotg_udc.c
drivers/video/mxc/mxc_ipuv3_fb.c
drivers/video/mxc_hdmi.c
include/linux/mxcfb.h
sound/soc/imx/imx-wm8962.c
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ipu.h | 10 | ||||
-rw-r--r-- | include/linux/mxc_asrc.h | 3 | ||||
-rw-r--r-- | include/linux/mxcfb.h | 11 |
3 files changed, 21 insertions, 3 deletions
diff --git a/include/linux/ipu.h b/include/linux/ipu.h index f8178f1b0473..ef55d80da4a3 100644 --- a/include/linux/ipu.h +++ b/include/linux/ipu.h @@ -1,5 +1,5 @@ /* - * Copyright 2005-2012 Freescale Semiconductor, Inc. + * Copyright 2005-2013 Freescale Semiconductor, Inc. */ /* @@ -168,6 +168,14 @@ struct ipu_deinterlace { u8 motion; /*see ipu_motion_sel*/ #define IPU_DEINTERLACE_FIELD_TOP 0 #define IPU_DEINTERLACE_FIELD_BOTTOM 1 +#define IPU_DEINTERLACE_FIELD_MASK \ + (IPU_DEINTERLACE_FIELD_TOP | IPU_DEINTERLACE_FIELD_BOTTOM) + /* deinterlace frame rate double flags */ +#define IPU_DEINTERLACE_RATE_EN 0x80 +#define IPU_DEINTERLACE_RATE_FRAME1 0x40 +#define IPU_DEINTERLACE_RATE_MASK \ + (IPU_DEINTERLACE_RATE_EN | IPU_DEINTERLACE_RATE_FRAME1) +#define IPU_DEINTERLACE_MAX_FRAME 2 u8 field_fmt; }; diff --git a/include/linux/mxc_asrc.h b/include/linux/mxc_asrc.h index 37c64b7c2200..7594ee68ae1c 100644 --- a/include/linux/mxc_asrc.h +++ b/include/linux/mxc_asrc.h @@ -1,5 +1,5 @@ /* - * Copyright 2008-2012 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2008-2013 Freescale Semiconductor, Inc. All Rights Reserved. */ /* @@ -34,6 +34,7 @@ #define ASRC_FLUSH _IOW(ASRC_IOC_MAGIC, 7, enum asrc_pair_index) enum asrc_pair_index { + ASRC_UNVALID_PAIR = -1, ASRC_PAIR_A, ASRC_PAIR_B, ASRC_PAIR_C diff --git a/include/linux/mxcfb.h b/include/linux/mxcfb.h index 3ea29f48229b..af792f516cfd 100644 --- a/include/linux/mxcfb.h +++ b/include/linux/mxcfb.h @@ -1,5 +1,5 @@ /* - * Copyright 2004-2012 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. */ /* @@ -132,6 +132,14 @@ struct mxcfb_waveform_modes { int mode_gc32; }; +/* + * Structure used to define a 5*3 matrix of parameters for + * setting IPU DP CSC module related to this framebuffer. + */ +struct mxcfb_csc_matrix { + int param[5][3]; +}; + #define MXCFB_WAIT_FOR_VSYNC _IOR('F', 0x20, unsigned long long) #define MXCFB_SET_GBL_ALPHA _IOW('F', 0x21, struct mxcfb_gbl_alpha) #define MXCFB_SET_CLR_KEY _IOW('F', 0x22, struct mxcfb_color_key) @@ -145,6 +153,7 @@ struct mxcfb_waveform_modes { #define MXCFB_GET_FB_BLANK _IOR('F', 0x2B, u_int32_t) #define MXCFB_SET_DIFMT _IOW('F', 0x2C, u_int32_t) #define MXCFB_ENABLE_VSYNC_EVENT _IOW('F', 0x33, int32_t) +#define MXCFB_CSC_UPDATE _IOW('F', 0x2D, struct mxcfb_csc_matrix) /* IOCTLs for E-ink panel updates */ #define MXCFB_SET_WAVEFORM_MODES _IOW('F', 0x2B, struct mxcfb_waveform_modes) |