diff options
| author | Hongzhang Yang <Hongzhang.Yang@freescale.com> | 2013-08-12 15:38:07 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2013-08-23 07:30:14 +0800 |
| commit | 6ee6bfd8c2b32159ad155f57c47cba75d00693cb (patch) | |
| tree | 9f46b7697d2c997cf425378f311ed7e2eb5f62a8 /include | |
| parent | f2d2df7557f4dc32bff1b53c0d83935632b187a1 (diff) | |
ENGR00274761-3 Upgrade VPU driver for Linux 3.10 kernel
Modify mxc_vpu.c to adapt to kernel 3.10 change
- Remove all references to header files in mach folder
- Include linux/clk.h instead of mach/clock.h
- Call device_reset instead of imx_src_reset_vpu
- Dummy PU and PM api callings before they are ready
- Dummy cpu_is_mx5? api callings
- Remove VM_RESERVED flags
- Call gen_pool instead of iram_alloc
Modify mxc_vpu.h
- Change CONFIG_ARCH_MX6 to CONFIG_SOC_IMX6Q
Modify Kconfig:
- Change ARCH_MX? to SOC_IMX?, remove ARCH_MX3/ARCH_MX37
because for MX3 series only SOC_IMX31 and SOC_IMX35 are
defined in Linux 3.10, and these chips don't have VPU.
Need to add SOC_IMX37 to VPU Kconfig if MX37 could be
supported later.
Add VPU to config and build path
- mxc/Kconfig
- mxc/Makefile
Signed-off-by: Hongzhang Yang <Hongzhang.Yang@freescale.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mxc_vpu.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/mxc_vpu.h b/include/linux/mxc_vpu.h index 7869d59c5eec..27f9377856aa 100644 --- a/include/linux/mxc_vpu.h +++ b/include/linux/mxc_vpu.h @@ -16,15 +16,15 @@ */ /*! - * @file plat-mxc/include/mach/mxc_vpu.h + * @file linux/mxc_vpu.h * * @brief VPU system initialization and file operation definition * * @ingroup VPU */ -#ifndef __ASM_ARCH_MXC_VPU_H__ -#define __ASM_ARCH_MXC_VPU_H__ +#ifndef __LINUX_MXC_VPU_H__ +#define __LINUX_MXC_VPU_H__ #include <linux/fs.h> @@ -79,7 +79,7 @@ struct vpu_mem_desc { #define BIT_FRAME_MEM_CTRL BIT_WORK_CTRL_BUF_REG(4) #define BIT_BIT_STREAM_PARAM BIT_WORK_CTRL_BUF_REG(5) -#ifndef CONFIG_ARCH_MX6 +#ifndef CONFIG_SOC_IMX6Q #define BIT_RESET_CTRL 0x11C #else #define BIT_RESET_CTRL 0x128 |