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

Commit 49b2f4c5 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab
Browse files

[media] exynos4-is: Remove support for non-dt platforms 



All platforms supported by this driver are going to get device tree
support in this kernel release so remove code that would have been
actually not used any more.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 4073f942

Documentation/video4linux/fimc.txt

+0 −30
Original line number Diff line number Diff line
@@ -140,39 +140,9 @@ You can either grep through the kernel log to find relevant information, i.e. 
or retrieve the information from /dev/media? with help of the media-ctl tool:

# media-ctl -p



6. Platform support

===================



The machine code (arch/arm/plat-samsung and arch/arm/mach-*) must select

following options:



CONFIG_S5P_DEV_FIMC0       mandatory

CONFIG_S5P_DEV_FIMC1  \

CONFIG_S5P_DEV_FIMC2  |    optional

CONFIG_S5P_DEV_FIMC3  |

CONFIG_S5P_SETUP_FIMC /

CONFIG_S5P_DEV_CSIS0  \    optional for MIPI-CSI interface

CONFIG_S5P_DEV_CSIS1  /



Except that, relevant s5p_device_fimc? should be registered in the machine code

in addition to a "s5p-fimc-md" platform device to which the media device driver

is bound.  The "s5p-fimc-md" device instance is required even if only mem-to-mem

operation is used.



The description of sensor(s) attached to FIMC/MIPI-CSIS camera inputs should be

passed as the "s5p-fimc-md" device platform_data.  The platform data structure

is defined in file include/media/s5p_fimc.h.



7. Build

========



This driver depends on following config options:

PLAT_S5P,

PM_RUNTIME,

I2C,

REGULATOR,

VIDEO_V4L2_SUBDEV_API,



If the driver is built as a loadable kernel module (CONFIG_VIDEO_SAMSUNG_S5P_FIMC=m)

two modules are created (in addition to the core v4l2 modules): s5p-fimc.ko and

optional s5p-csis.ko (MIPI-CSI receiver subdev).

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -7654,7 +7654,6 @@ L: linux-media@vger.kernel.org 
Q:	https://patchwork.linuxtv.org/project/linux-media/list/

S:	Supported

F:	drivers/media/platform/exynos4-is/

F:	include/media/s5p_fimc.h



SAMSUNG S3C24XX/S3C64XX SOC SERIES CAMIF DRIVER

M:	Sylwester Nawrocki <sylvester.nawrocki@gmail.com>

drivers/media/platform/exynos4-is/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ config VIDEO_SAMSUNG_EXYNOS4_IS 
	bool "Samsung S5P/EXYNOS4 SoC series Camera Subsystem driver"

	depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API

	depends on (PLAT_S5P || ARCH_EXYNOS)

	depends on OF && COMMON_CLK

	help

	  Say Y here to enable camera host interface devices for

	  Samsung S5P and EXYNOS SoC series.
@@ -17,7 +18,7 @@ config VIDEO_S5P_FIMC 
	depends on I2C

	select VIDEOBUF2_DMA_CONTIG

	select V4L2_MEM2MEM_DEV

	select MFD_SYSCON if OF

	select MFD_SYSCON

	select VIDEO_EXYNOS4_IS_COMMON

	help

	  This is a V4L2 driver for Samsung S5P and EXYNOS4 SoC camera host

drivers/media/platform/exynos4-is/common.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
 */



#include <linux/module.h>

#include <media/s5p_fimc.h>

#include <media/exynos-fimc.h>

#include "common.h"



/* Called with the media graph mutex held or entity->stream_count > 0. */

drivers/media/platform/exynos4-is/fimc-core.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <media/v4l2-device.h>

#include <media/v4l2-mem2mem.h>

#include <media/v4l2-mediabus.h>

#include <media/s5p_fimc.h>

#include <media/exynos-fimc.h>



#define dbg(fmt, args...) \

	pr_debug("%s:%d: " fmt "\n", __func__, __LINE__, ##args)