diff options
| author | Qiang.li <b19715@freescale.com> | 2013-02-01 15:05:39 +0800 |
|---|---|---|
| committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-06-02 09:51:03 -0700 |
| commit | 46f3e9bb0e0a99f7e1ff4fd505682f173ae49612 (patch) | |
| tree | 6b9fe9c9b6c1d2c950fb49cef0396e29adbc4296 /include | |
| parent | a1b7a82ef325f6dab85b745ffe29a1eba0c6e197 (diff) | |
Support BT656 and BT1120 output for iMX6 ipuv3.
modified: arch/arm/configs/imx6_defconfig
modified: arch/arm/mach-mx6/board-mx6q_sabresd.c
modified: arch/arm/mach-mx6/devices-imx6q.h
modified: arch/arm/plat-mxc/include/mach/ipu-v3.h
modified: drivers/media/video/mxc/output/mxc_vout.c
modified: drivers/mxc/ipu3/ipu_common.c
modified: drivers/mxc/ipu3/ipu_device.c
modified: drivers/mxc/ipu3/ipu_disp.c
modified: drivers/mxc/ipu3/ipu_prv.h
modified: drivers/mxc/ipu3/ipu_regs.h
modified: drivers/video/mxc/Kconfig
modified: drivers/video/mxc/Makefile
new file: drivers/video/mxc/mxc_bt656if.c
modified: drivers/video/mxc/mxc_ipuv3_fb.c
modified: include/linux/ipu.h
modified: include/linux/mxcfb.h
Conflicts:
drivers/video/mxc/mxc_ipuv3_fb.c
include/linux/mxcfb.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ipu.h | 2 | ||||
| -rw-r--r-- | include/linux/mxcfb.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/ipu.h b/include/linux/ipu.h index ef55d80da4a3..cc5fe27e1153 100644 --- a/include/linux/ipu.h +++ b/include/linux/ipu.h @@ -96,6 +96,8 @@ typedef enum { #define IPU_PIX_FMT_GENERIC_32 fourcc('I', 'P', 'U', '1') /*!< IPU Generic Data */ #define IPU_PIX_FMT_LVDS666 fourcc('L', 'V', 'D', '6') /*!< IPU Generic Data */ #define IPU_PIX_FMT_LVDS888 fourcc('L', 'V', 'D', '8') /*!< IPU Generic Data */ +#define IPU_PIX_FMT_BT656 fourcc('B', 'T', '6', '5') /*!< BT656, 16 UYVY */ +#define IPU_PIX_FMT_BT1120 fourcc('B', 'T', '1', '1') /*!< BT1120, 16 UYVY */ /*! @} */ /*! @name RGB Formats */ /*! @{ */ diff --git a/include/linux/mxcfb.h b/include/linux/mxcfb.h index e987efb7d6d0..15695d8a901b 100644 --- a/include/linux/mxcfb.h +++ b/include/linux/mxcfb.h @@ -153,6 +153,8 @@ struct mxcfb_csc_matrix { #define MXCFB_GET_FB_BLANK _IOR('F', 0x2B, u_int32_t) #define MXCFB_SET_DIFMT _IOW('F', 0x2C, u_int32_t) #define MXCFB_CSC_UPDATE _IOW('F', 0x2D, struct mxcfb_csc_matrix) +#define MXCFB_GET_FBFMT _IOR('F', 0x35, u_int32_t) +#define MXCFB_SET_FBFMT _IOR('F', 0x36, u_int32_t) /* IOCTLs for E-ink panel updates */ #define MXCFB_SET_WAVEFORM_MODES _IOW('F', 0x2B, struct mxcfb_waveform_modes) |