diff options
| author | Jason Chen <jason.chen@linaro.org> | 2011-12-06 15:47:50 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2012-01-11 21:39:18 +0800 |
| commit | d0f289f67f0ff403d92880c410b009f1fd4e69f3 (patch) | |
| tree | d6bbe95e5e70b9e4554e1012b9a322f2c86d3f1a /arch | |
| parent | 7c621e29907194e4114d044c4eb5abd1b1d61d1f (diff) | |
MXC VPU: merge to fsl 2.6.38 branch
to vpu commit c4c513c0f6d8ae7b77e05300a9496498c77fc767
Signed-off-by: Jason Chen <jason.chen@linaro.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/mxc_vpu.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mxc_vpu.h b/arch/arm/plat-mxc/include/mach/mxc_vpu.h index 0f81fb9eb7d..dd162a22dfe 100644 --- a/arch/arm/plat-mxc/include/mach/mxc_vpu.h +++ b/arch/arm/plat-mxc/include/mach/mxc_vpu.h @@ -55,11 +55,14 @@ struct vpu_mem_desc { #define VPU_IOC_REQ_VSHARE_MEM _IO(VPU_IOC_MAGIC, 9) #define VPU_IOC_SYS_SW_RESET _IO(VPU_IOC_MAGIC, 11) #define VPU_IOC_GET_SHARE_MEM _IO(VPU_IOC_MAGIC, 12) +#define VPU_IOC_QUERY_BITWORK_MEM _IO(VPU_IOC_MAGIC, 13) +#define VPU_IOC_SET_BITWORK_MEM _IO(VPU_IOC_MAGIC, 14) #define BIT_CODE_RUN 0x000 #define BIT_CODE_DOWN 0x004 #define BIT_INT_CLEAR 0x00C #define BIT_INT_STATUS 0x010 +#define BIT_INT_REASON 0x174 #define MJPEG_PIC_STATUS_REG 0x3004 |