diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-04-09 13:34:16 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-04-09 13:34:16 +0800 |
| commit | 52c5341f1302a0b328e7dd5890c12729406256fc (patch) | |
| tree | 687adeb27a395f512c2a0fa373bd173c437f9321 /include | |
| parent | bee5f57f1e3e5174aa5390a330052e772afdc453 (diff) | |
| parent | 3ec8c998827be5729ff98a0d7c097f7ad9ddbc6e (diff) | |
Merge remote branch 'fsl-linux-sdk/imx_3.0.15' into imx_3.0.15_android
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fsl_devices.h | 5 | ||||
| -rw-r--r-- | include/linux/ipu.h | 10 | ||||
| -rw-r--r-- | include/linux/mxc_asrc.h | 1 |
3 files changed, 12 insertions, 4 deletions
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index ba66c938ae0a..bec8fe9cd838 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h @@ -355,7 +355,10 @@ struct mxc_audio_platform_data { struct clk *ssi_clk[2]; int hp_gpio; - int hp_active_low; /* headphone irq is active loaw */ + int hp_active_low; /* headphone irq is active low */ + + int mic_gpio; + int mic_active_low; /* micphone irq is active low */ int sysclk; const char *codec_name; diff --git a/include/linux/ipu.h b/include/linux/ipu.h index 051624854558..973cfe9b45a5 100644 --- a/include/linux/ipu.h +++ b/include/linux/ipu.h @@ -1,5 +1,5 @@ /* - * Copyright 2005-2011 Freescale Semiconductor, Inc. + * Copyright 2005-2012 Freescale Semiconductor, Inc. */ /* @@ -124,6 +124,10 @@ typedef enum { #define IPU_PIX_FMT_VYU444 fourcc('V', '4', '4', '4') /*!< 24 VYU 4:4:4 */ /* two planes -- one Y, one Cb + Cr interleaved */ #define IPU_PIX_FMT_NV12 fourcc('N', 'V', '1', '2') /* 12 Y/CbCr 4:2:0 */ +/* two planes -- 12 tiled Y/CbCr 4:2:0 */ +#define IPU_PIX_FMT_TILED_NV12 fourcc('T', 'N', 'V', 'P') +#define IPU_PIX_FMT_TILED_NV12F fourcc('T', 'N', 'V', 'F') + /*! @} */ /*! @name YUV Planar Formats */ /*! @{ */ @@ -136,7 +140,7 @@ typedef enum { #define IPU_PIX_FMT_YVU422P fourcc('Y', 'V', '1', '6') /*!< 16 YVU 4:2:2 */ #define IPU_PIX_FMT_YUV422P fourcc('4', '2', '2', 'P') /*!< 16 YUV 4:2:2 */ /*! @} */ - +#define IPU_PIX_FMT_TILED_NV12_MBALIGN (16) /* IPU device */ typedef enum { RGB_CS, @@ -244,6 +248,8 @@ enum { IPU_CHECK_ERR_SPLIT_OUTPUTW_OVER, IPU_CHECK_ERR_SPLIT_OUTPUTH_OVER, IPU_CHECK_ERR_SPLIT_WITH_ROT, + IPU_CHECK_ERR_NOT_SUPPORT, + IPU_CHECK_ERR_NOT16ALIGN, }; /* IOCTL commands */ diff --git a/include/linux/mxc_asrc.h b/include/linux/mxc_asrc.h index 6de6a7e3cd86..4ccf8cb496ca 100644 --- a/include/linux/mxc_asrc.h +++ b/include/linux/mxc_asrc.h @@ -204,7 +204,6 @@ struct asrc_pair_params { struct dma_block input_dma[ASRC_DMA_BUFFER_NUM]; struct dma_block output_dma_total; struct dma_block output_dma[ASRC_DMA_BUFFER_NUM]; - struct semaphore busy_lock; struct dma_async_tx_descriptor *desc_in; struct dma_async_tx_descriptor *desc_out; }; |