From: ljf <ljf@rock-chips.com>
Date: Tue, 1 Apr 2014 10:11:02 +0000 (+0800)
Subject: rk3288: enable iep clocks
X-Git-Tag: firefly_0821_release~5663
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0ea16142f976f15e1b7b2e1bd14640082f32284b;p=firefly-linux-kernel-4.4.55.git

rk3288: enable iep clocks
---

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 9244837de220..aa3b31612a4a 100755
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -953,7 +953,7 @@
 		reg = <0xff900000 0x800>;
 		interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&clk_gates15 2>, <&clk_gates15 3>;
-		clock_names = "aclk_iep", "hclk_iep";
+		clock-names = "aclk_iep", "hclk_iep";
 		status = "okay";
 	};
 
diff --git a/drivers/video/rockchip/iep/iep_drv.c b/drivers/video/rockchip/iep/iep_drv.c
index 3faa4a9634a4..130c681d2150 100755
--- a/drivers/video/rockchip/iep/iep_drv.c
+++ b/drivers/video/rockchip/iep/iep_drv.c
@@ -37,7 +37,7 @@
 #include "hw_iep_reg.h"
 
 #define IEP_MAJOR		255
-//#define IEP_CLK_ENABLE
+#define IEP_CLK_ENABLE
 //#define IEP_TEST_CASE
 
 //#undef dmac_flush_range
@@ -872,8 +872,8 @@ err_irq:
         devm_release_mem_region(&pdev->dev, res->start, resource_size(res));
     }
 err_ioremap:
-err_clock:
     wake_lock_destroy(&data->wake_lock);
+err_clock:
     kfree(data);
 
     return ret;