3 files changed, 1 insertions, 46 deletions
diff --git a/drivers/media/video/samsung/fimc/csis.c b/drivers/media/video/samsung/fimc/csis.c
index b2e3b8e..a78e0ae 100644
--- a/drivers/media/video/samsung/fimc/csis.c
+++ b/drivers/media/video/samsung/fimc/csis.c
@@ -19,13 +19,13 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/videodev2.h>
+#include <linux/slab.h>
 
 #include <linux/io.h>
 #include <linux/memory.h>
 #include <plat/clock.h>
 #include <plat/regs-csis.h>
 #include <plat/csis.h>
-#include <mach/pd.h>
 #include "csis.h"
 
 static struct s3c_csis_info *s3c_csis;
@@ -271,13 +271,6 @@ static int s3c_csis_clk_on(struct platform_device *pdev)
 	struct clk *parent, *mout_csis;
 	int ret;
 
-	/* power domain enable for mipi-csis */
-	ret = s5pv210_pd_enable("csis_pd");
-	if (ret < 0) {
-		err("failed to enable csis power domain\n");
-		return -EINVAL;
-	}
-
 	pdata = to_csis_plat(&pdev->dev);
 
 	/* mout_mpll */
@@ -323,13 +316,6 @@ static int s3c_csis_clk_off(struct platform_device *pdev)
 	/* clock disable for csis */
 	clk_disable(s3c_csis->clock);
 
-	/* power domain disable for mipi-csis */
-	ret = s5pv210_pd_disable("csis_pd");
-	if (ret < 0) {
-		err("failed to enable csis power domain\n");
-		return -EINVAL;
-	}
-
 	return 0;
 }
 
diff --git a/drivers/media/video/samsung/fimc/fimc_dev.c b/drivers/media/video/samsung/fimc/fimc_dev.c
index ee10ad8..1cef449 100644
--- a/drivers/media/video/samsung/fimc/fimc_dev.c
+++ b/drivers/media/video/samsung/fimc/fimc_dev.c
@@ -31,7 +31,6 @@
 #include <plat/media.h>
 #include <mach/media.h>
 #include <plat/fimc.h>
-#include <mach/pd.h>
 #include <linux/videodev2_samsung.h>
 
 #include "fimc.h"
@@ -902,10 +901,6 @@ static int fimc_open(struct file *filp)
 	prv_data->ctrl = ctrl;
 	filp->private_data = prv_data;
 
-	ret = s5pv210_pd_enable("fimc_pd");
-	if (ret < 0) 
-		fimc_err("failed to enable fimcn power domain\n");
-
 	if (in_use == 1) {
 		fimc_clk_en(ctrl, true);
 
diff --git a/drivers/media/video/samsung/jpeg_v2/s3c-jpeg.c b/drivers/media/video/samsung/jpeg_v2/s3c-jpeg.c
index edf4db7..789ad9b 100644
--- a/drivers/media/video/samsung/jpeg_v2/s3c-jpeg.c
+++ b/drivers/media/video/samsung/jpeg_v2/s3c-jpeg.c
@@ -32,7 +32,6 @@
 #include <mach/irqs.h>
 #include <linux/semaphore.h>
 #include <mach/map.h>
-#include <mach/pd.h>
 #include <linux/miscdevice.h>
 #include <linux/vmalloc.h>
 #include <linux/string.h>
@@ -104,12 +103,6 @@ static int s3c_jpeg_open(struct inode *inode, struct file *file)
 	sspc100_jpg_ctx *jpg_reg_ctx;
 	DWORD	ret;
 
-	ret = s5pv210_pd_enable("jpeg_pd");
-	if (ret < 0) {
-		jpg_err("failed to enable jpeg power domain\n");
-		return FALSE;
-	}
-	
         /* clock enable */
 	clk_enable(s3c_jpeg_clk);
 	
@@ -174,11 +167,6 @@ static int s3c_jpeg_release(struct inode *inode, struct file *file)
 
 /* clock disable */
 	clk_disable(s3c_jpeg_clk);
-	ret = s5pv210_pd_disable("jpeg_pd");
-	if (ret < 0) {
-		jpg_err("failed to disable jpeg power domain\n");
-		return FALSE;
-	}
 
 	return 0;
 }
@@ -459,28 +447,14 @@ static int s3c_jpeg_remove(struct platform_device *dev)
 #ifdef CONFIG_CPU_S5PV210
 static int s3c_jpeg_suspend(struct platform_device *pdev, pm_message_t state)
 {
-	int ret;
 	/* clock disable */
 	clk_disable(s3c_jpeg_clk);
 	
-	ret = s5pv210_pd_disable("jpeg_pd");
-	if (ret < 0) {
-		jpg_err("failed to disable jpeg power domain\n");
-		return FALSE;
-	}
 	return 0;
 }
 
 static int s3c_jpeg_resume(struct platform_device *pdev)
 {
-	int ret;
-	
-	ret = s5pv210_pd_enable("jpeg_pd");
-	if (ret < 0) {
-		jpg_err("failed to enable jpeg power domain\n");
-		return FALSE;
-	}
-	
 	/* clock enable */
 	clk_enable(s3c_jpeg_clk);