fimc-is: fix includes and make the code to compile on ARM64

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

42 files changed, 115 insertions, 179 deletions

diff --git a/drivers/media/platform/exynos/fimc-is/Makefile b/drivers/media/platform/exynos/fimc-is/Makefile
index a4767f85e9ad..c4b396d766bb 100644
--- a/drivers/media/platform/exynos/fimc-is/Makefile
+++ b/drivers/media/platform/exynos/fimc-is/Makefile
@@ -21,7 +21,8 @@ fimc-is-objs	:= fimc-is-core.o \
 		fimc-is-device-ischain.o \
 		fimc-is-interface.o \
 		fimc-is-time.o \
-		fimc-is-dt.o
+		fimc-is-dt.o \
+		exynos-smc.o
 
 obj-$(CONFIG_USE_VENDER_FEATURE) := fimc-is-spi.o \
 				fimc-is-sec-define.o \
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-companion-dt.c b/drivers/media/platform/exynos/fimc-is/fimc-is-companion-dt.c
index 4756e18e5d83..b71d1d2675b8 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-companion-dt.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-companion-dt.c
@@ -10,10 +10,14 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/device.h>
 #include <linux/sched.h>
+#include <linux/mutex.h>
+#include <linux/slab.h>
+#include <linux/videodev2.h>
+#include "fimc-is-config.h"
 #include "exynos-fimc-is-sensor.h"
 #include "exynos-fimc-is.h"
-#include "media/exynos_mc.h"
 #include <linux/of_gpio.h>
 
 #include "fimc-is-dt.h"
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-config.h b/drivers/media/platform/exynos/fimc-is/fimc-is-config.h
index a2e8ff8878ab..53b04ad14997 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-config.h
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-config.h
@@ -24,7 +24,7 @@
 #define ENABLE_FAST_SHOT
 /* #define ENABLE_MIF_400 */
 #define ENABLE_DTP
-#define USE_ION_ALLOC
+//#define USE_ION_ALLOC
 
 #define START_DVFS_LEVEL FIMC_IS_SN_MAX
 
@@ -32,6 +32,8 @@
 #define TARGET_SPI_CH_FOR_PERI	0
 #define MAX_ZOOM_LEVEL 8
 
+#define EXYNOS_VIDEONODE_FLITE(x)		(36 + x)
+#define EXYNOS_VIDEONODE_FIMC_IS		(100)
 
 #if !defined(MAX_ZOOM_LEVEL)
 /* default max zoom lv is 4 */
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-core.c b/drivers/media/platform/exynos/fimc-is/fimc-is-core.c
index a66b3deef5a5..d9867450332f 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-core.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-core.c
@@ -18,24 +18,17 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <mach/videonode.h>
-#include <media/exynos_mc.h>
 #include <asm/cacheflush.h>
 #include <asm/pgtable.h>
 #include <linux/firmware.h>
 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
 #include <linux/videodev2.h>
-#include <linux/videodev2_exynos_camera.h>
 #include <linux/vmalloc.h>
 #include <linux/interrupt.h>
-#include <mach/regs-clock.h>
 #include <linux/bug.h>
 #include <linux/v4l2-mediabus.h>
-#include <mach/devfreq.h>
-#include <mach/bts.h>
 #include <linux/gpio.h>
-#include <plat/gpio-cfg.h>
 
 #include <linux/of.h>
 #include <linux/of_gpio.h>
@@ -114,6 +107,8 @@ static int fimc_is_ischain_allocmem(struct fimc_is_core *this)
 	fw_size = PAGE_ALIGN(fw_size);
 	dbg_core("Allocating memory for FIMC-IS firmware.\n");
 
+#warning NOT IMPLEMENTED
+#if 0
 	fw_cookie = vb2_ion_private_alloc(this->mem.alloc_ctx, fw_size, 1, 0);
 
 	if (IS_ERR(fw_cookie)) {
@@ -145,8 +140,11 @@ static int fimc_is_ischain_allocmem(struct fimc_is_core *this)
 		goto exit;
 	}
 
+#warning NOT IMPLEMENTED
+#if 0
 	vb2_ion_sync_for_device(fw_cookie, 0, fw_size, DMA_BIDIRECTIONAL);
-
+#endif
+#endif
 exit:
 	info("[COR] Device virtual for internal: %08x\n", this->minfo.kvaddr);
 	this->minfo.fw_cookie = fw_cookie;
@@ -846,12 +844,7 @@ static int fimc_is_probe(struct platform_device *pdev)
 	fimc_is_parse_children_dt(&pdev->dev, core);
 
 	fimc_is_dev = &pdev->dev;
-	ret = dev_set_drvdata(fimc_is_dev, core);
-	if (ret) {
-		err("dev_set_drvdata is fail(%d)", ret);
-		kfree(core);
-		return ret;
-	}
+	dev_set_drvdata(fimc_is_dev, core);
 
 	core->companion_spi_channel = pdata->companion_spi_channel;
 	core->use_two_spi_line = pdata->use_two_spi_line;
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-device-af.c b/drivers/media/platform/exynos/fimc-is/fimc-is-device-af.c
index ca5340a2912e..97e20c30b610 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-device-af.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-device-af.c
@@ -28,7 +28,6 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
 #include <linux/delay.h>
-#include <mach/pinctrl-samsung.h>
 
 #include "fimc-is-core.h"
 #include "fimc-is-interface.h"
@@ -78,7 +77,7 @@ static void fimc_is_af_i2c_config(struct i2c_client *client, bool onoff)
 		} else {
 			devm_pinctrl_put(pinctrl_i2c);
 		}
-    }
+	}
 }
 
 int fimc_is_af_i2c_write(struct i2c_client *client ,u16 addr, u16 data)
@@ -375,6 +374,8 @@ static int fimc_is_af_probe(struct i2c_client *client,
 	core->client2 = client;
 	device->client = client;
 	device->core = core;
+
+#if 0
 	af_noise_count = 0;
 
 	af_sensor_interface.af_pdata = device;
@@ -382,6 +383,7 @@ static int fimc_is_af_probe(struct i2c_client *client,
 	ret = remove_af_noise_register(&af_sensor_interface);
 	if (ret)
 		err("reduce_af_noise_register failed: %d\n", ret);
+#endif
 	i2c_set_clientdata(client, device);
 
 	return 0;
@@ -389,7 +391,9 @@ static int fimc_is_af_probe(struct i2c_client *client,
 
 static int fimc_is_af_remove(struct i2c_client *client)
 {
+#if 0
 	remove_af_noise_unregister(&af_sensor_interface);
+#endif
 	return 0;
 }
 
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-device-companion.c b/drivers/media/platform/exynos/fimc-is/fimc-is-device-companion.c
index 54681a3e6e2e..9d2a21d1c082 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-device-companion.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-device-companion.c
@@ -18,8 +18,6 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <mach/videonode.h>
-#include <media/exynos_mc.h>
 #include <asm/cacheflush.h>
 #include <asm/pgtable.h>
 #include <linux/firmware.h>
@@ -27,14 +25,10 @@
 #include <linux/scatterlist.h>
 #include <linux/videodev2.h>
 #include <linux/videodev2_exynos_camera.h>
-#include <linux/videodev2_exynos_media.h>
 #include <linux/v4l2-mediabus.h>
 #include <linux/bug.h>
 #include <linux/i2c.h>
 
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-#include <mach/pinctrl-samsung.h>
 
 #include "fimc-is-video.h"
 #include "fimc-is-dt.h"
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-device-csi.c b/drivers/media/platform/exynos/fimc-is/fimc-is-device-csi.c
index 83cc2f1f19b4..cc4e8f9cca33 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-device-csi.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-device-csi.c
@@ -18,10 +18,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-#include <mach/exynos5-mipiphy.h>
-
+#include "exynos5-mipiphy.h"
 #include "fimc-is-config.h"
 #include "fimc-is-regs.h"
 #include "fimc-is-hw.h"
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-device-flite.c b/drivers/media/platform/exynos/fimc-is/fimc-is-device-flite.c
index 6611b3011f5e..9c290c79e426 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-device-flite.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-device-flite.c
@@ -21,8 +21,6 @@
 #include <linux/of_irq.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <mach/videonode.h>
-#include <media/exynos_mc.h>
 #include <asm/cacheflush.h>
 #include <asm/pgtable.h>
 #include <linux/firmware.h>
@@ -30,13 +28,9 @@
 #include <linux/scatterlist.h>
 #include <linux/videodev2.h>
 #include <linux/videodev2_exynos_camera.h>
-#include <linux/videodev2_exynos_media.h>
 #include <linux/v4l2-mediabus.h>
 #include <linux/bug.h>
 
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-#include <mach/irqs.h>
 
 #include "fimc-is-time.h"
 #include "fimc-is-core.h"
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-device-ischain.c b/drivers/media/platform/exynos/fimc-is/fimc-is-device-ischain.c
index cd90731008a9..cc77bd5108a4 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-device-ischain.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-device-ischain.c
@@ -18,16 +18,12 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <mach/videonode.h>
-#include <media/exynos_mc.h>
 #include <asm/cacheflush.h>
 #include <asm/pgtable.h>
 #include <linux/firmware.h>
 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
 #include <linux/videodev2.h>
-#include <linux/videodev2_exynos_camera.h>
-#include <linux/videodev2_exynos_media.h>
 #include <linux/v4l2-mediabus.h>
 #include <linux/vmalloc.h>
 #include <linux/kthread.h>
@@ -36,12 +32,9 @@
 #include <linux/syscalls.h>
 #include <linux/bug.h>
 
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-#include <mach/smc.h>
+#include "smc.h"
 #include <linux/regulator/consumer.h>
 #include <linux/gpio.h>
-#include <plat/gpio-cfg.h>
 
 #include "fimc-is-time.h"
 #include "fimc-is-core.h"
@@ -55,7 +48,6 @@
 #include "fimc-is-companion.h"
 #include "fimc-is-device-companion.h"
 #include <linux/pinctrl/consumer.h>
-#include <mach/pinctrl-samsung.h>
 
 #include "fimc-is-sec-define.h"
 
@@ -132,8 +124,11 @@ static int isfw_debug_read(struct file *file, char __user *user_buf,
 		goto exit;
 	}
 
+#warning NOT IMPLEMENTED
+#if 0
 	vb2_ion_sync_for_device(imemory->fw_cookie, DEBUG_OFFSET,
 		DEBUG_CNT, DMA_FROM_DEVICE);
+#endif
 
 	debug_cnt = *((int *)(imemory->kvaddr + DEBUGCTL_OFFSET)) - DEBUG_OFFSET;
 	backup_cnt = core->debug_cnt;
@@ -688,32 +683,43 @@ static int fimc_is_ishcain_deinitmem(struct fimc_is_device_ischain *device)
 static void fimc_is_ischain_cache_flush(struct fimc_is_device_ischain *this,
 	u32 offset, u32 size)
 {
+#warning NOT IMPLEMENTED
+#if 0
 	vb2_ion_sync_for_device(this->imemory.fw_cookie,
 		offset,
 		size,
 		DMA_TO_DEVICE);
+#endif
 }
 
 static void fimc_is_ischain_region_invalid(struct fimc_is_device_ischain *device)
 {
+#warning NOT IMPLEMENTED
+#if 0
 	vb2_ion_sync_for_device(
 		device->imemory.fw_cookie,
 		device->imemory.offset_region,
 		sizeof(struct is_region),
 		DMA_FROM_DEVICE);
+#endif
 }
 
 static void fimc_is_ischain_region_flush(struct fimc_is_device_ischain *device)
 {
+#warning NOT IMPLEMENTED
+#if 0
 	vb2_ion_sync_for_device(
 		device->imemory.fw_cookie,
 		device->imemory.offset_region,
 		sizeof(struct is_region),
 		DMA_TO_DEVICE);
+#endif
 }
 
 void fimc_is_ischain_meta_flush(struct fimc_is_frame *frame)
 {
+#warning NOT IMPLEMENTED
+#if 0
 #ifdef ENABLE_CACHE
 	vb2_ion_sync_for_device(
 		(void *)frame->cookie_shot,
@@ -721,10 +727,13 @@ void fimc_is_ischain_meta_flush(struct fimc_is_frame *frame)
 		frame->shot_size,
 		DMA_TO_DEVICE);
 #endif
+#endif
 }
 
 void fimc_is_ischain_meta_invalid(struct fimc_is_frame *frame)
 {
+#warning NOT IMPLEMENTED
+#if 0
 #ifdef ENABLE_CACHE
 	vb2_ion_sync_for_device(
 		(void *)frame->cookie_shot,
@@ -732,6 +741,7 @@ void fimc_is_ischain_meta_invalid(struct fimc_is_frame *frame)
 		frame->shot_size,
 		DMA_FROM_DEVICE);
 #endif
+#endif
 }
 
 static void fimc_is_ischain_version(struct fimc_is_device_ischain *this, char *name, const char *load_bin, u32 size)
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-device-ois.c b/drivers/media/platform/exynos/fimc-is/fimc-is-device-ois.c
index 70cf6301b894..2a14f9e311f4 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-device-ois.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-device-ois.c
@@ -29,7 +29,6 @@
 #include <linux/regulator/consumer.h>
 #include <linux/delay.h>
 #include "exynos-fimc-is-sensor.h"
-#include <mach/pinctrl-samsung.h>
 #include <linux/kthread.h>
 
 #include "fimc-is-core.h"
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-device-sensor.c b/drivers/media/platform/exynos/fimc-is/fimc-is-device-sensor.c
index 84af2055e74e..34f0af2f89a9 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-device-sensor.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-device-sensor.c
@@ -18,8 +18,6 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <mach/videonode.h>
-#include <media/exynos_mc.h>
 #include <asm/cacheflush.h>
 #include <asm/pgtable.h>
 #include <linux/firmware.h>
@@ -27,14 +25,10 @@
 #include <linux/scatterlist.h>
 #include <linux/videodev2.h>
 #include <linux/videodev2_exynos_camera.h>
-#include <linux/videodev2_exynos_media.h>
 #include <linux/v4l2-mediabus.h>
 #include <linux/bug.h>
 #include <linux/i2c.h>
 
-#include <mach/map.h>
-#include <mach/devfreq.h>
-#include <mach/regs-clock.h>
 
 #include "fimc-is-core.h"
 #include "fimc-is-param.h"
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-dt.c b/drivers/media/platform/exynos/fimc-is/fimc-is-dt.c
index 94069d193ced..76746cc5a17b 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-dt.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-dt.c
@@ -13,7 +13,6 @@
 #include <linux/sched.h>
 #include "exynos-fimc-is-sensor.h"
 #include "exynos-fimc-is.h"
-#include <media/exynos_mc.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
 #include <linux/regmap.h>
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-framemgr.c b/drivers/media/platform/exynos/fimc-is/fimc-is-framemgr.c
index f59f352175f6..7ae550ff4a3e 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-framemgr.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-framemgr.c
@@ -18,21 +18,15 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <mach/videonode.h>
-#include <media/exynos_mc.h>
 #include <asm/cacheflush.h>
 #include <asm/pgtable.h>
 #include <linux/firmware.h>
 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
 #include <linux/videodev2.h>
-#include <linux/videodev2_exynos_camera.h>
-#include <linux/videodev2_exynos_media.h>
 #include <linux/v4l2-mediabus.h>
 #include <linux/bug.h>
 
-#include <mach/map.h>
-#include <mach/regs-clock.h>
 
 #include "fimc-is-core.h"
 #include "fimc-is-param.h"
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-groupmgr.c b/drivers/media/platform/exynos/fimc-is/fimc-is-groupmgr.c
index 23b06fd94a98..f931a156dab4 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-groupmgr.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-groupmgr.c
@@ -18,21 +18,15 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <mach/videonode.h>
-#include <media/exynos_mc.h>
 #include <asm/cacheflush.h>
 #include <asm/pgtable.h>
 #include <linux/firmware.h>
 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
 #include <linux/videodev2.h>
-#include <linux/videodev2_exynos_camera.h>
-#include <linux/videodev2_exynos_media.h>
 #include <linux/v4l2-mediabus.h>
 #include <linux/bug.h>
 
-#include <mach/map.h>
-#include <mach/regs-clock.h>
 
 #include "fimc-is-core.h"
 #include "fimc-is-err.h"
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-hw-csi.c b/drivers/media/platform/exynos/fimc-is/fimc-is-hw-csi.c
index f8846549eda7..d24522beb9a0 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-hw-csi.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-hw-csi.c
@@ -16,9 +16,6 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-#include <mach/exynos5-mipiphy.h>
 
 #include "fimc-is-config.h"
 #include "fimc-is-type.h"
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-hw-ischain.c b/drivers/media/platform/exynos/fimc-is/fimc-is-hw-ischain.c
index fb3dc98eb435..3479b713bb2c 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-hw-ischain.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-hw-ischain.c
@@ -15,12 +15,7 @@
 #include <linux/errno.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
-#include <mach/devfreq.h>
-#include <mach/bts.h>
 
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-#include <mach/exynos5-mipiphy.h>
 
 #include "fimc-is-config.h"
 #include "fimc-is-type.h"
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-interface.c b/drivers/media/platform/exynos/fimc-is/fimc-is-interface.c
index 7e15382f2452..26c1417e83bc 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-interface.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-interface.c
@@ -2493,8 +2493,11 @@ int fimc_is_hw_logdump(struct fimc_is_interface *this)
 	core = (struct fimc_is_core *)this->core;
 	sentence_i = 0;
 
+#warning NOT IMPLEMENTED
+#if 0
 	vb2_ion_sync_for_device(core->minfo.fw_cookie,
 		DEBUG_OFFSET, DEBUG_CNT, DMA_FROM_DEVICE);
+#endif
 
 	debug = (char *)(core->minfo.kvaddr + DEBUG_OFFSET);
 	debug_cnt = *((int *)(core->minfo.kvaddr + DEBUGCTL_OFFSET))
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-mem.c b/drivers/media/platform/exynos/fimc-is/fimc-is-mem.c
index 30d5dabc0111..d128c3525722 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-mem.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-mem.c
@@ -18,15 +18,13 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <mach/videonode.h>
-#include <media/exynos_mc.h>
 #include <asm/cacheflush.h>
 #include <asm/pgtable.h>
 #include <linux/firmware.h>
 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
+#include <media/videobuf2-dma-contig.h>
 #include <linux/videodev2.h>
-#include <linux/videodev2_exynos_camera.h>
 #include <linux/vmalloc.h>
 #include <linux/interrupt.h>
 #include <linux/of.h>
@@ -37,12 +35,7 @@
 #include "fimc-is-regs.h"
 #include "fimc-is-err.h"
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0))
-#include <linux/exynos_iovmm.h>
-#else
-#include <plat/iovmm.h>
-#endif
-
+#ifdef IOC_ALLOC
 static void *fimc_is_ion_init(struct platform_device *pdev)
 {
 	return vb2_ion_create_context(&pdev->dev, SZ_4K,
@@ -50,15 +43,18 @@ static void *fimc_is_ion_init(struct platform_device *pdev)
 					VB2ION_CTX_VMCONTIG |
 					VB2ION_CTX_KVA_ONDEMAND);
 }
+#endif
 
 static unsigned long plane_addr(struct vb2_buffer *vb, u32 plane_no)
 {
+#ifdef IOC_ALLOC
 	void *cookie = vb2_plane_cookie(vb, plane_no);
 	dma_addr_t dva = 0;
 
 	WARN_ON(vb2_ion_dma_address(cookie, &dva) != 0);
-
-	return dva;
+#else
+	return vb2_dma_contig_plane_dma_addr(vb, plane_no);
+#endif
 }
 
 static unsigned long plane_kvaddr(struct vb2_buffer *vb, u32 plane_no)
@@ -68,6 +64,33 @@ static unsigned long plane_kvaddr(struct vb2_buffer *vb, u32 plane_no)
 	return (unsigned long)kvaddr;
 }
 
+
+static void *fimc_is_dma_contig_init(struct platform_device *pdev)
+{
+	return vb2_dma_contig_init_ctx(&pdev->dev);
+}
+
+int vb2_null_attach_iommu(void *alloc_ctx)
+{
+	return 0;
+}
+
+void vb2_null_detach_iommu(void *alloc_ctx)
+{
+
+}
+
+void vb2_null_set_cached(void *ctx, bool cached)
+{
+
+}
+
+void vb2_null_destroy_context(void *ctx)
+{
+
+}
+
+#ifdef IOC_ALLOC
 const struct fimc_is_vb2 fimc_is_vb2_ion = {
 	.ops		= &vb2_ion_memops,
 	.init		= fimc_is_ion_init,
@@ -78,13 +101,27 @@ const struct fimc_is_vb2 fimc_is_vb2_ion = {
 	.suspend	= vb2_ion_detach_iommu,
 	.set_cacheable	= vb2_ion_set_cached,
 };
+#define fimc_is_vb2_allocator (&fimc_is_vb2_ion)
+#else
+const struct fimc_is_vb2 fimc_is_vb2_dc = {
+	.ops		= &vb2_dma_contig_memops,
+	.init		= fimc_is_dma_contig_init,
+	.cleanup	= vb2_null_destroy_context,
+	.plane_addr	= plane_addr,
+	.plane_kvaddr	= plane_kvaddr,
+	.resume		= vb2_null_attach_iommu,
+	.suspend	= vb2_null_detach_iommu,
+	.set_cacheable	= vb2_null_set_cached,
+};
+#define fimc_is_vb2_allocator (&fimc_is_vb2_dc)
+#endif
 
 int fimc_is_mem_probe(struct fimc_is_mem *this,
 	struct platform_device *pdev)
 {
 	u32 ret = 0;
 
-	this->vb2 = &fimc_is_vb2_ion;
+	this->vb2 = fimc_is_vb2_allocator;
 
 	this->alloc_ctx = this->vb2->init(pdev);
 	if (IS_ERR(this->alloc_ctx)) {
@@ -92,9 +129,10 @@ int fimc_is_mem_probe(struct fimc_is_mem *this,
 		goto p_err;
 	}
 
+#ifdef IOC_ALLOC
 	/* FIXME: should be different by device type */
 	exynos_create_iovmm(&pdev->dev, 1, 4);
-
+#endif
 p_err:
 	return ret;
 }
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-regs.h b/drivers/media/platform/exynos/fimc-is/fimc-is-regs.h
index b12a1945bbbb..1086ae36a626 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-regs.h
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-regs.h
@@ -12,7 +12,6 @@
 #ifndef FIMC_IS_REGS_H
 #define FIMC_IS_REGS_H
 
-#include <mach/map.h>
 
 /* MCUCTL register */
 #define MCUCTL				0x0
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-resourcemgr.c b/drivers/media/platform/exynos/fimc-is/fimc-is-resourcemgr.c
index a5f58f24ecf6..788590bb2963 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-resourcemgr.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-resourcemgr.c
@@ -7,14 +7,9 @@
 #include <linux/clk.h>
 #include <linux/regulator/consumer.h>
 #include <linux/videodev2.h>
-#include <linux/videodev2_exynos_camera.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
-#include <mach/regs-gpio.h>
-#include <mach/regs-clock.h>
-#include <plat/clock.h>
-#include <plat/gpio-cfg.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-subdev.h>
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-sec-define.c b/drivers/media/platform/exynos/fimc-is/fimc-is-sec-define.c
index 087d6f90a413..2342ee40be72 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-sec-define.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-sec-define.c
@@ -1,5 +1,4 @@
 #include "fimc-is-sec-define.h"
-#include <mach/pinctrl-samsung.h>
 
 
 bool crc32_fw_check = true;
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-sec-define.h b/drivers/media/platform/exynos/fimc-is/fimc-is-sec-define.h
index 6f8fb659839b..3b84c7efffb2 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-sec-define.h
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-sec-define.h
@@ -9,24 +9,18 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <mach/videonode.h>
 #include <asm/cacheflush.h>
 #include <asm/pgtable.h>
 #include <linux/firmware.h>
 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
 #include <linux/videodev2.h>
-#include <linux/videodev2_exynos_camera.h>
-#include <linux/videodev2_exynos_media.h>
 #include <linux/v4l2-mediabus.h>
 #include <linux/bug.h>
 #include <linux/syscalls.h>
 #include <linux/vmalloc.h>
 
-#include <mach/map.h>
-#include <mach/regs-clock.h>
 #include <linux/gpio.h>
-#include <plat/gpio-cfg.h>
 #include <linux/regulator/consumer.h>
 
 #include "fimc-is-core.h"
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-spi.c b/drivers/media/platform/exynos/fimc-is/fimc-is-spi.c
index 8151b3109e4e..e5db569da8e8 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-spi.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-spi.c
@@ -17,7 +17,6 @@
 #include <linux/module.h>
 #include <linux/spi/spi.h>
 #include <linux/gpio.h>
-#include <plat/gpio-cfg.h>
 #include "fimc-is-core.h"
 #include "fimc-is-regs.h"
 
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-type.h b/drivers/media/platform/exynos/fimc-is/fimc-is-type.h
index 2f70fa828dbc..e677d30cfd01 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-type.h
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-type.h
@@ -1,10 +1,10 @@
 #ifndef FIMC_IS_TYPE_H
 #define FIMC_IS_TYPE_H
 
-#include <linux/v4l2-mediabus.h>
-
+#include <media/v4l2-mediabus.h>
 #include <media/v4l2-device.h>
 
+
 enum fimc_is_device_type {
 	FIMC_IS_DEVICE_SENSOR,
 	FIMC_IS_DEVICE_ISCHAIN
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-video-3aa.c b/drivers/media/platform/exynos/fimc-is/fimc-is-video-3aa.c
index 0d308f340644..d34fdfa03927 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-video-3aa.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-video-3aa.c
@@ -18,14 +18,12 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <mach/videonode.h>
-#include <media/exynos_mc.h>
+#include <linux/videodev2.h>
 #include <asm/cacheflush.h>
 #include <asm/pgtable.h>
 #include <linux/firmware.h>
 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
-#include <linux/videodev2_exynos_media.h>
 #include <linux/videodev2_exynos_camera.h>
 #include <linux/v4l2-mediabus.h>
 #include <linux/bug.h>
@@ -35,7 +33,6 @@
 #include <media/v4l2-device.h>
 #include <media/v4l2-mem2mem.h>
 #include <media/v4l2-mediabus.h>
-#include <media/exynos_mc.h>
 
 #include "fimc-is-core.h"
 #include "fimc-is-param.h"
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-video-3aac.c b/drivers/media/platform/exynos/fimc-is/fimc-is-video-3aac.c
index 3f63054c95e2..a7a106651838 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-video-3aac.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-video-3aac.c
@@ -18,14 +18,12 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <mach/videonode.h>
-#include <media/exynos_mc.h>
+#include <linux/videodev2.h>
 #include <asm/cacheflush.h>
 #include <asm/pgtable.h>
 #include <linux/firmware.h>
 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
-#include <linux/videodev2_exynos_media.h>
 #include <linux/videodev2_exynos_camera.h>
 #include <linux/v4l2-mediabus.h>
 #include <linux/bug.h>
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-video-companion.c b/drivers/media/platform/exynos/fimc-is/fimc-is-video-companion.c
index aae5c1689c30..125fbd1061cf 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-video-companion.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-video-companion.c
@@ -18,14 +18,12 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <mach/videonode.h>
-#include <media/exynos_mc.h>
+#include <linux/videodev2.h>
 #include <asm/cacheflush.h>
 #include <asm/pgtable.h>
 #include <linux/firmware.h>
 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
-#include <linux/videodev2_exynos_media.h>
 #include <linux/videodev2_exynos_camera.h>
 #include <linux/v4l2-mediabus.h>
 #include <linux/bug.h>
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-video-isp.c b/drivers/media/platform/exynos/fimc-is/fimc-is-video-isp.c
index 50a7e1b3eca3..b55917efeb73 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-video-isp.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-video-isp.c
@@ -18,15 +18,12 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <mach/videonode.h>
-#include <media/exynos_mc.h>
 #include <asm/cacheflush.h>
 #include <asm/pgtable.h>
 #include <linux/firmware.h>
 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
 #include <linux/videodev2.h>
-#include <linux/videodev2_exynos_media.h>
 #include <linux/videodev2_exynos_camera.h>
 #include <linux/v4l2-mediabus.h>
 #include <linux/bug.h>
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-video-scc.c b/drivers/media/platform/exynos/fimc-is/fimc-is-video-scc.c
index ebe1a0191a42..0f29cf439e3b 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-video-scc.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-video-scc.c
@@ -18,15 +18,12 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <mach/videonode.h>
-#include <media/exynos_mc.h>
 #include <asm/cacheflush.h>
 #include <asm/pgtable.h>
 #include <linux/firmware.h>
 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
 #include <linux/videodev2.h>
-#include <linux/videodev2_exynos_media.h>
 #include <linux/videodev2_exynos_camera.h>
 #include <linux/v4l2-mediabus.h>
 #include <linux/bug.h>
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-video-scp.c b/drivers/media/platform/exynos/fimc-is/fimc-is-video-scp.c
index 42600bb2c5b8..28728efda1c5 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-video-scp.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-video-scp.c
@@ -18,15 +18,12 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <mach/videonode.h>
-#include <media/exynos_mc.h>
 #include <asm/cacheflush.h>
 #include <asm/pgtable.h>
 #include <linux/firmware.h>
 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
 #include <linux/videodev2.h>
-#include <linux/videodev2_exynos_media.h>
 #include <linux/videodev2_exynos_camera.h>
 #include <linux/v4l2-mediabus.h>
 #include <linux/bug.h>
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-video-sensor.c b/drivers/media/platform/exynos/fimc-is/fimc-is-video-sensor.c
index d7c7917feac3..e58d832b75b0 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-video-sensor.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-video-sensor.c
@@ -18,14 +18,12 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <mach/videonode.h>
-#include <media/exynos_mc.h>
+#include <linux/videodev2.h>
 #include <asm/cacheflush.h>
 #include <asm/pgtable.h>
 #include <linux/firmware.h>
 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
-#include <linux/videodev2_exynos_media.h>
 #include <linux/videodev2_exynos_camera.h>
 #include <linux/v4l2-mediabus.h>
 #include <linux/bug.h>
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-video-vdisc.c b/drivers/media/platform/exynos/fimc-is/fimc-is-video-vdisc.c
index afe74ba41059..6c5cfb12cf5c 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-video-vdisc.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-video-vdisc.c
@@ -18,15 +18,12 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <mach/videonode.h>
-#include <media/exynos_mc.h>
 #include <asm/cacheflush.h>
 #include <asm/pgtable.h>
 #include <linux/firmware.h>
 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
 #include <linux/videodev2.h>
-#include <linux/videodev2_exynos_media.h>
 #include <linux/videodev2_exynos_camera.h>
 #include <linux/v4l2-mediabus.h>
 #include <linux/bug.h>
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-video-vdiso.c b/drivers/media/platform/exynos/fimc-is/fimc-is-video-vdiso.c
index 3270f820bd4d..c56611aa459e 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-video-vdiso.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-video-vdiso.c
@@ -18,15 +18,12 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <mach/videonode.h>
-#include <media/exynos_mc.h>
 #include <asm/cacheflush.h>
 #include <asm/pgtable.h>
 #include <linux/firmware.h>
 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
 #include <linux/videodev2.h>
-#include <linux/videodev2_exynos_media.h>
 #include <linux/videodev2_exynos_camera.h>
 #include <linux/v4l2-mediabus.h>
 #include <linux/bug.h>
diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-video.c b/drivers/media/platform/exynos/fimc-is/fimc-is-video.c
index 70a110018b7e..26aab5c0da4c 100644
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-video.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-video.c
@@ -18,16 +18,12 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <mach/videonode.h>
-#include <media/exynos_mc.h>
 #include <asm/cacheflush.h>
 #include <asm/pgtable.h>
 #include <linux/firmware.h>
 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
 #include <linux/videodev2.h>
-#include <linux/videodev2_exynos_media.h>
-#include <linux/videodev2_exynos_camera.h>
 #include <linux/v4l2-mediabus.h>
 #include <linux/bug.h>
 
@@ -36,7 +32,6 @@
 #include <media/v4l2-device.h>
 #include <media/v4l2-mem2mem.h>
 #include <media/v4l2-mediabus.h>
-#include <media/exynos_mc.h>
 
 #include "fimc-is-time.h"
 #include "fimc-is-core.h"
@@ -305,9 +300,8 @@ static int queue_init(void *priv, struct vb2_queue *vbq_src,
 		vbq_src->drv_priv	= vctx;
 		vbq_src->ops		= vctx->vb2_ops;
 		vbq_src->mem_ops	= vctx->mem_ops;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
-		vbq_src->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
-#endif
+		vbq_src->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+
 		ret = vb2_queue_init(vbq_src);
 		if (ret) {
 			err("vb2_queue_init fail");
@@ -322,9 +316,8 @@ static int queue_init(void *priv, struct vb2_queue *vbq_src,
 		vbq_dst->drv_priv	= vctx;
 		vbq_dst->ops		= vctx->vb2_ops;
 		vbq_dst->mem_ops	= vctx->mem_ops;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
-		vbq_dst->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
-#endif
+		vbq_dst->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+
 		ret = vb2_queue_init(vbq_dst);
 		if (ret) {
 			err("vb2_queue_init fail");
@@ -340,9 +333,8 @@ static int queue_init(void *priv, struct vb2_queue *vbq_src,
 		vbq_src->drv_priv	= vctx;
 		vbq_src->ops		= vctx->vb2_ops;
 		vbq_src->mem_ops	= vctx->mem_ops;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
-		vbq_src->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
-#endif
+		vbq_src->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+
 		ret = vb2_queue_init(vbq_src);
 		if (ret) {
 			err("vb2_queue_init fail");
@@ -355,9 +347,8 @@ static int queue_init(void *priv, struct vb2_queue *vbq_src,
 		vbq_dst->drv_priv	= vctx;
 		vbq_dst->ops		= vctx->vb2_ops;
 		vbq_dst->mem_ops	= vctx->mem_ops;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
-		vbq_dst->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
-#endif
+		vbq_dst->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+
 		ret = vb2_queue_init(vbq_dst);
 		if (ret) {
 			err("vb2_queue_init fail");
@@ -1115,7 +1106,7 @@ int fimc_is_video_qbuf(struct file *file,
 	BUG_ON(!vctx);
 	BUG_ON(!buf);
 
-	buf->flags &= ~V4L2_BUF_FLAG_USE_SYNC;
+//	buf->flags &= ~V4L2_BUF_FLAG_USE_SYNC;
 	queue = GET_VCTX_QUEUE(vctx, buf);
 	vbq = queue->vbq;
 
diff --git a/drivers/media/platform/exynos/fimc-is/sensor/fimc-is-device-6d1.c b/drivers/media/platform/exynos/fimc-is/sensor/fimc-is-device-6d1.c
index d8385b3913be..e2205adea758 100644
--- a/drivers/media/platform/exynos/fimc-is/sensor/fimc-is-device-6d1.c
+++ b/drivers/media/platform/exynos/fimc-is/sensor/fimc-is-device-6d1.c
@@ -19,15 +19,10 @@
 #include <linux/clk.h>
 #include <linux/regulator/consumer.h>
 #include <linux/videodev2.h>
-#include <linux/videodev2_exynos_camera.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
 #include <linux/of_gpio.h>
-#include <mach/regs-gpio.h>
-#include <mach/regs-clock.h>
-#include <plat/clock.h>
-#include <plat/gpio-cfg.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-subdev.h>
diff --git a/drivers/media/platform/exynos/fimc-is/sensor/fimc-is-device-imx240.c b/drivers/media/platform/exynos/fimc-is/sensor/fimc-is-device-imx240.c
index 587172615b34..c1d9a21f60eb 100644
--- a/drivers/media/platform/exynos/fimc-is/sensor/fimc-is-device-imx240.c
+++ b/drivers/media/platform/exynos/fimc-is/sensor/fimc-is-device-imx240.c
@@ -19,15 +19,10 @@
 #include <linux/clk.h>
 #include <linux/regulator/consumer.h>
 #include <linux/videodev2.h>
-#include <linux/videodev2_exynos_camera.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
 #include <linux/of_gpio.h>
-#include <mach/regs-gpio.h>
-#include <mach/regs-clock.h>
-#include <plat/clock.h>
-#include <plat/gpio-cfg.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-subdev.h>
diff --git a/drivers/media/platform/exynos/fimc-is/setup-fimc-is-companion.c b/drivers/media/platform/exynos/fimc-is/setup-fimc-is-companion.c
index 994e6d242dc6..180993801b7e 100644
--- a/drivers/media/platform/exynos/fimc-is/setup-fimc-is-companion.c
+++ b/drivers/media/platform/exynos/fimc-is/setup-fimc-is-companion.c
@@ -21,12 +21,6 @@
 #include <linux/delay.h>
 #include <linux/clk-provider.h>
 #include <linux/clkdev.h>
-#include <mach/regs-gpio.h>
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-#include <plat/gpio-cfg.h>
-#include <plat/map-s5p.h>
-#include <plat/cpu.h>
 #include <linux/of_gpio.h>
 
 #include "exynos-fimc-is.h"
diff --git a/drivers/media/platform/exynos/fimc-is/setup-fimc-is-sensor.c b/drivers/media/platform/exynos/fimc-is/setup-fimc-is-sensor.c
index 5232695f9cd7..f2289f5afd3b 100644
--- a/drivers/media/platform/exynos/fimc-is/setup-fimc-is-sensor.c
+++ b/drivers/media/platform/exynos/fimc-is/setup-fimc-is-sensor.c
@@ -21,14 +21,7 @@
 #include <linux/delay.h>
 #include <linux/clk-provider.h>
 #include <linux/clkdev.h>
-#include <mach/regs-gpio.h>
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-#include <plat/gpio-cfg.h>
-#include <plat/map-s5p.h>
-#include <plat/cpu.h>
 #include <linux/of_gpio.h>
-#include <mach/regs-clock-exynos5433.h>
 
 #include "exynos-fimc-is.h"
 #include "exynos-fimc-is-sensor.h"
diff --git a/drivers/media/platform/exynos/fimc-is/setup-fimc-is.c b/drivers/media/platform/exynos/fimc-is/setup-fimc-is.c
index bb3613f0d643..63d54889fab4 100644
--- a/drivers/media/platform/exynos/fimc-is/setup-fimc-is.c
+++ b/drivers/media/platform/exynos/fimc-is/setup-fimc-is.c
@@ -21,12 +21,6 @@
 #include <linux/delay.h>
 #include <linux/clk-provider.h>
 #include <linux/clkdev.h>
-#include <mach/regs-gpio.h>
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-#include <plat/gpio-cfg.h>
-#include <plat/map-s5p.h>
-#include <plat/cpu.h>
 #include "exynos-fimc-is.h"
 #include <linux/of_gpio.h>
 
diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h
index 38d960d8dccd..c0df617e1055 100644
--- a/include/media/v4l2-mediabus.h
+++ b/include/media/v4l2-mediabus.h
@@ -11,7 +11,7 @@
 #ifndef V4L2_MEDIABUS_H
 #define V4L2_MEDIABUS_H
 
-#include <linux/v4l2-mediabus.h>
+#include <uapi/linux/v4l2-mediabus.h>
 
 /* Parallel flags */
 /*
diff --git a/include/uapi/linux/v4l2-mediabus.h b/include/uapi/linux/v4l2-mediabus.h
index 26db20647e6f..13f5ba994db6 100644
--- a/include/uapi/linux/v4l2-mediabus.h
+++ b/include/uapi/linux/v4l2-mediabus.h
@@ -36,7 +36,6 @@ struct v4l2_mbus_framefmt {
 	__u32			reserved[6];
 };
 
-#ifndef __KERNEL__
 /*
  * enum v4l2_mbus_pixelcode and its definitions are now deprecated, and
  * MEDIA_BUS_FMT_ definitions (defined in media-bus-format.h) should be
@@ -133,6 +132,5 @@ enum v4l2_mbus_pixelcode {
 
 	V4L2_MBUS_FROM_MEDIA_BUS_FMT(AHSV8888_1X32),
 };
-#endif /* __KERNEL__ */
 
 #endif
diff --git a/include/uapi/linux/videodev2_exynos_camera.h b/include/uapi/linux/videodev2_exynos_camera.h
index ecef0b3b1640..aded0be06f6c 100644
--- a/include/uapi/linux/videodev2_exynos_camera.h
+++ b/include/uapi/linux/videodev2_exynos_camera.h
@@ -57,6 +57,8 @@ enum is_set_stream {
 #define V4L2_CID_IS_END_OF_STREAM		(V4L2_CID_FIMC_IS_BASE + 58)
 #define V4L2_CID_IS_MAP_BUFFER			(V4L2_CID_FIMC_IS_BASE + 59)
 #define V4L2_CID_IS_INTENT			(V4L2_CID_FIMC_IS_BASE + 60)
+#define V4L2_CID_IS_DEBUG_DUMP			(V4L2_CID_FIMC_IS_BASE + 900)
+#define V4L2_CID_IS_DEBUG_SYNC_LOG		(V4L2_CID_FIMC_IS_BASE + 901)
 
 #define V4L2_CID_SENSOR_SET_AE_TARGET			(V4L2_CID_SENSOR_BASE + 1)
 #define V4L2_CID_SENSOR_SET_AE_WEIGHT_1x1_2		(V4L2_CID_SENSOR_BASE + 2)