[media] s5p-fimc: Change the driver directory name to exynos4-is

The s5p-fimc directory now contains drivers for multiple IP blocks
found in multiple Samsung application processors. This includes FIMC
(CAMIF), MIPI CSIS and FIMC LITE. FIMC-IS (Imaging Subsystem) driver
is going to be put into same directory. Hence we rename it to
exynos4-is as s5p-fimc was only relevant for early version of this
driver, when it only supported FIMC IP block.

The imaging subsystem drivers for Exynos4 SoC series and S5PV210 will
be included in drivers/media/platform/exynos4-is directory, with some
modules shared with exynos5 series, while the rest of exynos5 specific
modules will find their home in drivers/media/platform/exynos5-is.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 42c62aa..ae89545 100644 (file)
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -122,7 +122,7 @@ config VIDEO_S3C_CAMIF
          will be called s3c-camif.
 
 source "drivers/media/platform/soc_camera/Kconfig"
-source "drivers/media/platform/s5p-fimc/Kconfig"
+source "drivers/media/platform/exynos4-is/Kconfig"
 source "drivers/media/platform/s5p-tv/Kconfig"
 
 endif # V4L_PLATFORM_DRIVERS

diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 42089ba..eee28dd 100644 (file)
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -30,7 +30,7 @@ obj-$(CONFIG_VIDEO_SH_VEU)            += sh_veu.o
 obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE)        += m2m-deinterlace.o
 
 obj-$(CONFIG_VIDEO_S3C_CAMIF)          += s3c-camif/
-obj-$(CONFIG_VIDEO_SAMSUNG_S5P_FIMC)   += s5p-fimc/
+obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS)         += exynos4-is/
 obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG)   += s5p-jpeg/
 obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC)    += s5p-mfc/
 obj-$(CONFIG_VIDEO_SAMSUNG_S5P_TV)     += s5p-tv/

diff --git a/drivers/media/platform/s5p-fimc/Kconfig b/drivers/media/platform/exynos4-is/Kconfig
similarity index 86%
rename from drivers/media/platform/s5p-fimc/Kconfig
rename to drivers/media/platform/exynos4-is/Kconfig
index c5caf08..91dbd4b 100644 (file)
--- a/drivers/media/platform/s5p-fimc/Kconfig
+++ b/drivers/media/platform/exynos4-is/Kconfig
@@ -1,13 +1,13 @@
 
-config VIDEO_SAMSUNG_S5P_FIMC
-       bool "Samsung S5P/EXYNOS SoC camera interface driver (experimental)"
+config VIDEO_SAMSUNG_EXYNOS4_IS
+       bool "Samsung S5P/EXYNOS4 SoC series Camera Subsystem driver"
        depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && PLAT_S5P && PM_RUNTIME
        depends on MFD_SYSCON
        help
          Say Y here to enable camera host interface devices for
          Samsung S5P and EXYNOS SoC series.
 
-if VIDEO_SAMSUNG_S5P_FIMC
+if VIDEO_SAMSUNG_EXYNOS4_IS
 
 config VIDEO_S5P_FIMC
        tristate "S5P/EXYNOS4 FIMC/CAMIF camera interface driver"
@@ -16,7 +16,7 @@ config VIDEO_S5P_FIMC
        select V4L2_MEM2MEM_DEV
        help
          This is a V4L2 driver for Samsung S5P and EXYNOS4 SoC camera host
-         interface and video postprocessor (FIMC and FIMC-LITE) devices.
+         interface and video postprocessor (FIMC) devices.
 
          To compile this driver as a module, choose M here: the
          module will be called s5p-fimc.

diff --git a/drivers/media/platform/s5p-fimc/Makefile b/drivers/media/platform/exynos4-is/Makefile
similarity index 94%
rename from drivers/media/platform/s5p-fimc/Makefile
rename to drivers/media/platform/exynos4-is/Makefile
index 4648514..8c67441 100644 (file)
--- a/drivers/media/platform/s5p-fimc/Makefile
+++ b/drivers/media/platform/exynos4-is/Makefile
@@ -1,4 +1,4 @@
-s5p-fimc-objs := fimc-core.o fimc-reg.o fimc-m2m.o fimc-capture.o fimc-mdevice.o
+s5p-fimc-objs := fimc-core.o fimc-reg.o fimc-m2m.o fimc-capture.o media-dev.o
 exynos-fimc-lite-objs += fimc-lite-reg.o fimc-lite.o
 s5p-csis-objs := mipi-csis.o
 

diff --git a/drivers/media/platform/s5p-fimc/fimc-capture.c b/drivers/media/platform/exynos4-is/fimc-capture.c
similarity index 99%
rename from drivers/media/platform/s5p-fimc/fimc-capture.c
rename to drivers/media/platform/exynos4-is/fimc-capture.c
index 1675d38..965b07f 100644 (file)
--- a/drivers/media/platform/s5p-fimc/fimc-capture.c
+++ b/drivers/media/platform/exynos4-is/fimc-capture.c
@@ -27,7 +27,7 @@
 #include <media/videobuf2-core.h>
 #include <media/videobuf2-dma-contig.h>
 
-#include "fimc-mdevice.h"
+#include "media-dev.h"
 #include "fimc-core.h"
 #include "fimc-reg.h"
 

diff --git a/drivers/media/platform/s5p-fimc/fimc-core.c b/drivers/media/platform/exynos4-is/fimc-core.c
similarity index 99%
rename from drivers/media/platform/s5p-fimc/fimc-core.c
rename to drivers/media/platform/exynos4-is/fimc-core.c
index 1edd3aa..1248cdd 100644 (file)
--- a/drivers/media/platform/s5p-fimc/fimc-core.c
+++ b/drivers/media/platform/exynos4-is/fimc-core.c
@@ -32,7 +32,7 @@
 
 #include "fimc-core.h"
 #include "fimc-reg.h"
-#include "fimc-mdevice.h"
+#include "media-dev.h"
 
 static char *fimc_clocks[MAX_FIMC_CLOCKS] = {
        "sclk_fimc", "fimc"

diff --git a/drivers/media/platform/s5p-fimc/fimc-core.h b/drivers/media/platform/exynos4-is/fimc-core.h
similarity index 100%
rename from drivers/media/platform/s5p-fimc/fimc-core.h
rename to drivers/media/platform/exynos4-is/fimc-core.h

diff --git a/drivers/media/platform/s5p-fimc/fimc-lite-reg.c b/drivers/media/platform/exynos4-is/fimc-lite-reg.c
similarity index 100%
rename from drivers/media/platform/s5p-fimc/fimc-lite-reg.c
rename to drivers/media/platform/exynos4-is/fimc-lite-reg.c

diff --git a/drivers/media/platform/s5p-fimc/fimc-lite-reg.h b/drivers/media/platform/exynos4-is/fimc-lite-reg.h
similarity index 100%
rename from drivers/media/platform/s5p-fimc/fimc-lite-reg.h
rename to drivers/media/platform/exynos4-is/fimc-lite-reg.h

diff --git a/drivers/media/platform/s5p-fimc/fimc-lite.c b/drivers/media/platform/exynos4-is/fimc-lite.c
similarity index 99%
rename from drivers/media/platform/s5p-fimc/fimc-lite.c
rename to drivers/media/platform/exynos4-is/fimc-lite.c
index a37282e..bbcd743 100644 (file)
--- a/drivers/media/platform/s5p-fimc/fimc-lite.c
+++ b/drivers/media/platform/exynos4-is/fimc-lite.c
@@ -31,7 +31,7 @@
 #include <media/videobuf2-dma-contig.h>
 #include <media/s5p_fimc.h>
 
-#include "fimc-mdevice.h"
+#include "media-dev.h"
 #include "fimc-lite.h"
 #include "fimc-lite-reg.h"
 

diff --git a/drivers/media/platform/s5p-fimc/fimc-lite.h b/drivers/media/platform/exynos4-is/fimc-lite.h
similarity index 100%
rename from drivers/media/platform/s5p-fimc/fimc-lite.h
rename to drivers/media/platform/exynos4-is/fimc-lite.h

diff --git a/drivers/media/platform/s5p-fimc/fimc-m2m.c b/drivers/media/platform/exynos4-is/fimc-m2m.c
similarity index 99%
rename from drivers/media/platform/s5p-fimc/fimc-m2m.c
rename to drivers/media/platform/exynos4-is/fimc-m2m.c
index a224dac..8449c07 100644 (file)
--- a/drivers/media/platform/s5p-fimc/fimc-m2m.c
+++ b/drivers/media/platform/exynos4-is/fimc-m2m.c
@@ -29,8 +29,7 @@
 
 #include "fimc-core.h"
 #include "fimc-reg.h"
-#include "fimc-mdevice.h"
-
+#include "media-dev.h"
 
 static unsigned int get_m2m_fmt_flags(unsigned int stream_type)
 {

diff --git a/drivers/media/platform/s5p-fimc/fimc-reg.c b/drivers/media/platform/exynos4-is/fimc-reg.c
similarity index 99%
rename from drivers/media/platform/s5p-fimc/fimc-reg.c
rename to drivers/media/platform/exynos4-is/fimc-reg.c
index ee88b94..c276eb8 100644 (file)
--- a/drivers/media/platform/s5p-fimc/fimc-reg.c
+++ b/drivers/media/platform/exynos4-is/fimc-reg.c
@@ -14,7 +14,7 @@
 #include <linux/regmap.h>
 
 #include <media/s5p_fimc.h>
-#include "fimc-mdevice.h"
+#include "media-dev.h"
 
 #include "fimc-reg.h"
 #include "fimc-core.h"

diff --git a/drivers/media/platform/s5p-fimc/fimc-reg.h b/drivers/media/platform/exynos4-is/fimc-reg.h
similarity index 100%
rename from drivers/media/platform/s5p-fimc/fimc-reg.h
rename to drivers/media/platform/exynos4-is/fimc-reg.h

diff --git a/drivers/media/platform/s5p-fimc/fimc-mdevice.c b/drivers/media/platform/exynos4-is/media-dev.c
similarity index 99%
rename from drivers/media/platform/s5p-fimc/fimc-mdevice.c
rename to drivers/media/platform/exynos4-is/media-dev.c
index 77075a4..4a00577 100644 (file)
--- a/drivers/media/platform/s5p-fimc/fimc-mdevice.c
+++ b/drivers/media/platform/exynos4-is/media-dev.c
@@ -30,9 +30,9 @@
 #include <media/media-device.h>
 #include <media/s5p_fimc.h>
 
+#include "media-dev.h"
 #include "fimc-core.h"
 #include "fimc-lite.h"
-#include "fimc-mdevice.h"
 #include "mipi-csis.h"
 
 static int __fimc_md_set_camclk(struct fimc_md *fmd,

diff --git a/drivers/media/platform/s5p-fimc/fimc-mdevice.h b/drivers/media/platform/exynos4-is/media-dev.h
similarity index 100%
rename from drivers/media/platform/s5p-fimc/fimc-mdevice.h
rename to drivers/media/platform/exynos4-is/media-dev.h

diff --git a/drivers/media/platform/s5p-fimc/mipi-csis.c b/drivers/media/platform/exynos4-is/mipi-csis.c
similarity index 100%
rename from drivers/media/platform/s5p-fimc/mipi-csis.c
rename to drivers/media/platform/exynos4-is/mipi-csis.c

diff --git a/drivers/media/platform/s5p-fimc/mipi-csis.h b/drivers/media/platform/exynos4-is/mipi-csis.h
similarity index 100%
rename from drivers/media/platform/s5p-fimc/mipi-csis.h
rename to drivers/media/platform/exynos4-is/mipi-csis.h