From: chm <chm@rock-chips.com>
Date: Thu, 9 Aug 2012 06:18:07 +0000 (+0800)
Subject: rk2928: modify vpu_service file for compile
X-Git-Tag: firefly_0821_release~8912^2~25
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1e24535f8e0ff147dc3928f8a764633cb6a8d114;p=firefly-linux-kernel-4.4.55.git

rk2928: modify vpu_service file for compile
---

diff --git a/arch/arm/plat-rk/Kconfig b/arch/arm/plat-rk/Kconfig
index 58e73499aea2..44e2df19011a 100644
--- a/arch/arm/plat-rk/Kconfig
+++ b/arch/arm/plat-rk/Kconfig
@@ -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
diff --git a/arch/arm/plat-rk/include/plat/vpu_service.h b/arch/arm/plat-rk/include/plat/vpu_service.h
index 523c5dd72134..1ec121559670 100644
--- a/arch/arm/plat-rk/include/plat/vpu_service.h
+++ b/arch/arm/plat-rk/include/plat/vpu_service.h
@@ -39,7 +39,7 @@
 #define VPU_REG_NUM_PP                      (41)
 // client type: decoder plus post-process£º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)
diff --git a/arch/arm/plat-rk/vpu_service.c b/arch/arm/plat-rk/vpu_service.c
index f4c333f3fe6e..e254a9b71657 100644
--- a/arch/arm/plat-rk/vpu_service.c
+++ b/arch/arm/plat-rk/vpu_service.c
@@ -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);