From: wdc <wdc@rock-chips.com>
Date: Tue, 8 Jul 2014 01:17:24 +0000 (+0800)
Subject: 3036: fix vpu,hevc clk
X-Git-Tag: firefly_0821_release~4916^2~288
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=66b1b93849ceb0e298ddef9e663e900ab06078c5;p=firefly-linux-kernel-4.4.55.git

3036: fix vpu,hevc clk
---

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index d970a9fb382a..1147983a2172 100755
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -503,13 +503,13 @@
 		clock-names = "pclk_hdmi";	
 		status = "disabled";
 	};
-/*
+
         vpu: vpu_service@10108000 {
 		compatible = "vpu_service";
 		reg = <0x10108000 0x800>;
 		interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
 		interrupt-names = "irq_enc", "irq_dec";
-		clocks = <&clk_vdpu>, <&hclk_vdpu>;
+		clocks = <&aclk_vcodec_pre>, <&clk_gates3 12>;
 		clock-names = "aclk_vcodec", "hclk_vcodec";
 		name = "vpu_service";
 		status = "disabled";
@@ -520,11 +520,12 @@
 		reg = <0x1010c000 0x800>;
 		interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
 		interrupt-names = "irq_dec";
-		clocks = <&aclk_hevc>, <&hclk_hevc>, <&clk_hevc_core>, <&clk_hevc_cabac>;
-		clock-names = "aclk_vcodec", "hclk_vcodec", "clk_core", "clk_cabac";
+		clocks = <&aclk_vcodec_pre>, <&clk_gates3 12>, <&clk_hevc_core>;
+		clock-names = "aclk_vcodec", "hclk_vcodec", "clk_core";
 		name = "hevc_service";
 		status = "disabled";
-*/	
+        };
+	
 	vop_mmu {
 		dbgname = "vop";
 		compatible = "iommu,vop_mmu";