projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c6197c9
)
rk30: vpu_service: add rk30 enc hw id checklist
author
陈恒明
<chm@rock-chips.com>
Fri, 23 Mar 2012 07:37:07 +0000
(15:37 +0800)
committer
陈恒明
<chm@rock-chips.com>
Fri, 23 Mar 2012 07:37:07 +0000
(15:37 +0800)
arch/arm/plat-rk/vpu_service.c
patch
|
blob
|
history
diff --git
a/arch/arm/plat-rk/vpu_service.c
b/arch/arm/plat-rk/vpu_service.c
index c2c68821ffac44eebf75d94aade7989354c2e451..ab3559fd376eba73db38d5202a2f5e0307c8498e 100644
(file)
--- a/
arch/arm/plat-rk/vpu_service.c
+++ b/
arch/arm/plat-rk/vpu_service.c
@@
-64,7
+64,11
@@
#define DEC_IO_SIZE ((100 + 1) * 4) /* bytes */
#define ENC_IO_SIZE (96 * 4) /* bytes */
static const u16 dec_hw_ids[] = { 0x8190, 0x8170, 0x9170, 0x9190, 0x6731 };
+#if defined(CONFIG_ARCH_RK29)
static const u16 enc_hw_ids[] = { 0x6280, 0x7280, 0x8270 };
+#elif defined(CONFIG_ARCH_RK30)
+static const u16 enc_hw_ids[] = { 0x6280, 0x7280, 0x8270, 0x8290, 0x4831 };
+#endif
#define VPU_REG_EN_ENC 14
#define VPU_REG_ENC_GATE 2