rk3288: enable iep clocks

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 9244837de22084d69102c8a8625a67eb3ba61b63..aa3b31612a4a7eeb6e263643cf8236e4114d16e6 100755 (executable)
--- 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 3faa4a9634a42db8c107443527b8fa2d6ae7dc6a..130c681d21507dccceb667738732bd23f85f23d4 100755 (executable)
--- 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"\r
 \r
 #define IEP_MAJOR              255\r
-//#define IEP_CLK_ENABLE\r
+#define IEP_CLK_ENABLE\r
 //#define IEP_TEST_CASE\r
 \r
 //#undef dmac_flush_range\r
@@ -872,8 +872,8 @@ err_irq:
         devm_release_mem_region(&pdev->dev, res->start, resource_size(res));\r
     }\r
 err_ioremap:\r
-err_clock:\r
     wake_lock_destroy(&data->wake_lock);\r
+err_clock:\r
     kfree(data);\r
 \r
     return ret;\r