Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56fa1a6a authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 80f958f4

drivers/media/platform/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/media/platform/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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/

drivers/media/platform/s5p-fimc/Kconfig→drivers/media/platform/exynos4-is/Kconfig

+4 −4
Original line number Diff line number Diff line 


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.

drivers/media/platform/s5p-fimc/Makefile→drivers/media/platform/exynos4-is/Makefile

+1 −1
Original line number Diff line number Diff line 
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

drivers/media/platform/s5p-fimc/fimc-capture.c→drivers/media/platform/exynos4-is/fimc-capture.c

+1 −1
Original line number Diff line number Diff line
@@ -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"