From: sayon.chen <sayon.chen@rock-chips.com>
Date: Wed, 9 Mar 2016 01:02:45 +0000 (+0800)
Subject: video: rockchip: iep: iep code modify
X-Git-Tag: firefly_0821_release~3239
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=23e9578703aaf7db735d5bf2d983ab8df3cc7618;p=firefly-linux-kernel-4.4.55.git

video: rockchip: iep: iep code modify

fix iep code compile fail in kernel-4.4

Change-Id: Iba105baecff5fe474cd0d9c02dc9b7970e9c9990
Signed-off-by: sayon.chen <sayon.chen@rock-chips.com>
---

diff --git a/drivers/video/rockchip/iep/Makefile b/drivers/video/rockchip/iep/Makefile
index b16da1019b78..0d058cac079f 100755
--- a/drivers/video/rockchip/iep/Makefile
+++ b/drivers/video/rockchip/iep/Makefile
@@ -1,2 +1 @@
 obj-$(CONFIG_IEP) += hw_iep_reg.o iep_drv.o 
-obj-$(CONFIG_IEP_MMU) += iep_mmu.o
diff --git a/drivers/video/rockchip/iep/iep_drv.c b/drivers/video/rockchip/iep/iep_drv.c
index b1bfb96f0493..7ed253eb9a54 100644
--- a/drivers/video/rockchip/iep/iep_drv.c
+++ b/drivers/video/rockchip/iep/iep_drv.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2013 ROCKCHIP, Inc.
  *
  * This software is licensed under the terms of the GNU General Public
@@ -9,7 +9,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  */
 
 #include <linux/clk.h>
@@ -203,7 +203,7 @@ static void iep_del_running_list_timeout(void)
 
 static inline void iep_queue_power_off_work(void)
 {
-	queue_delayed_work(system_nrt_wq, &iep_drvdata1->power_off_work, IEP_POWER_OFF_DELAY);
+	queue_delayed_work(system_wq, &iep_drvdata1->power_off_work, IEP_POWER_OFF_DELAY);
 }
 
 static void iep_power_on(void)
diff --git a/drivers/video/rockchip/iep/iep_drv.h b/drivers/video/rockchip/iep/iep_drv.h
index 9a44e0c4930a..496e0d04cf15 100644
--- a/drivers/video/rockchip/iep/iep_drv.h
+++ b/drivers/video/rockchip/iep/iep_drv.h
@@ -5,7 +5,7 @@
 #include <linux/miscdevice.h>
 #include <linux/mutex.h>
 
-#if defined(CONFIG_ROCKCHIP_IOMMU) && defined(CONFIG_ION_ROCKCHIP)
+#if defined(CONFIG_RK_IOMMU) && defined(CONFIG_ION_ROCKCHIP)
 #define CONFIG_IEP_IOMMU
 #endif