shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 21:07:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

rk2928: modify vpu_service file for compile

Browse Source
This commit is contained in:
chm
2012-08-09 14:18:07 +08:00
parent 864efa1415
commit 1e24535f8e
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/plat-rk/Kconfig
View File

@@ -121,7 +121,7 @@ config WIFI_CONTROL_FUNC
config RK29_VPU
tristate "VPU (Video Processing Unit) service driver in kernel"
depends on ARCH_RK29 || ARCH_RK30
depends on ARCH_RK29 || ARCH_RK30 || ARCH_RK2928
default m
config RK29_LAST_LOG

2
arch/arm/plat-rk/include/plat/vpu_service.h
View File

@@ -39,7 +39,7 @@
#define VPU_REG_NUM_PP (41)
// client type: decoder plus post-process<73><73>101 registers, size 404B
#define VPU_REG_NUM_DEC_PP (VPU_REG_NUM_DEC+VPU_REG_NUM_PP)
#if defined(CONFIG_ARCH_RK29)
#if defined(CONFIG_ARCH_RK29) || defined(CONFIG_ARCH_RK2928)
// client type: encoder only: 96 registers, size 384B for rk29
#define VPU_REG_NUM_ENC (96)
#elif defined(CONFIG_ARCH_RK30)

10
arch/arm/plat-rk/vpu_service.c
View File

@@ -57,7 +57,7 @@
#define REG_NUM_DEC (60)
#define REG_NUM_PP (41)
#if defined(CONFIG_ARCH_RK29)
#if defined(CONFIG_ARCH_RK29) || defined(CONFIG_ARCH_RK2928)
#define REG_NUM_ENC (96)
#elif defined(CONFIG_ARCH_RK30)
#define REG_NUM_ENC (164)
@@ -66,14 +66,14 @@
#define SIZE_REG(reg) ((reg)*4)
#define DEC_IO_SIZE ((100 + 1) * 4) /* bytes */
#if defined(CONFIG_ARCH_RK29)
#if defined(CONFIG_ARCH_RK29) || defined(CONFIG_ARCH_RK2928)
#define ENC_IO_SIZE (96 * 4) /* bytes */
#elif defined(CONFIG_ARCH_RK30)
#define ENC_IO_SIZE (164 * 4) /* bytes */
#endif
#define REG_NUM_DEC_PP (REG_NUM_DEC+REG_NUM_PP)
static const u16 dec_hw_ids[] = { 0x8190, 0x8170, 0x9170, 0x9190, 0x6731 };
#if defined(CONFIG_ARCH_RK29)
#if defined(CONFIG_ARCH_RK29) || defined(CONFIG_ARCH_RK2928)
static const u16 enc_hw_ids[] = { 0x6280, 0x7280, 0x8270 };
#define DEC_PHY_OFFSET 0x200
#elif defined(CONFIG_ARCH_RK30)
@@ -290,7 +290,7 @@ static void vpu_service_power_off(void)
}
printk("vpu: power off...");
#ifdef CONFIG_ARCH_RK29
#if defined(CONFIG_ARCH_RK29)
pmu_set_power_domain(PD_VCODEC, false);
#else
clk_disable(pd_video);
@@ -334,7 +334,7 @@ static void vpu_service_power_on(void)
clk_enable(hclk_vepu);
clk_enable(hclk_cpu_vcodec);
udelay(10);
#ifdef CONFIG_ARCH_RK29
#if defined(CONFIG_ARCH_RK29)
pmu_set_power_domain(PD_VCODEC, true);
#else
clk_enable(pd_video);