From 0ea16142f976f15e1b7b2e1bd14640082f32284b Mon Sep 17 00:00:00 2001 From: ljf Date: Tue, 1 Apr 2014 18:11:02 +0800 Subject: [PATCH] rk3288: enable iep clocks --- arch/arm/boot/dts/rk3288.dtsi | 2 +- drivers/video/rockchip/iep/iep_drv.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 = ; 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; -- 2.34.1