Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-06 12:11:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] omap24xx/tcm825x: move to staging for future removal

Browse Source 
The omap24xx driver and the tcm825x sensor driver are the only two
remaining drivers to still use the old deprecated v4l2-int-device API.

Nobody maintains these drivers anymore. But unfortunately the v4l2-int-device
API is used by out-of-tree drivers (MXC platform). This is a very bad situation
since as long as this deprecated API stays in the kernel there is no reason for
those out-of-tree drivers to convert.

This patch moves v4l2-int-device and the two drivers that depend on it to
staging in preparation for their removal.

If someone would be interested in getting these drivers to work, then start with
this since it's not very far from the state where they used to work:

<URL:http://vihersipuli.retiisi.org.uk/cgi-bin/gitweb.cgi?p=~sailus/linux-omap/.git;a=summary>

The branch is n800-cam. Porting to up-to-date APIs can then be done. David
might have done some work in that area, so check with him first.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Sakari Ailus <sakari.ailus@iki.fi>
Cc: David Cohen <dacohen@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Hans Verkuil 2013-12-12 09:04:44 -03:00 committed by Mauro Carvalho Chehab
parent b8da9d3aaf
commit a03636cb21
17 changed files with 48 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/i2c/Kconfig
View File

@ -555,14 +555,6 @@ config VIDEO_MT9V032
This is a Video4Linux2 sensor-level driver for the Micron
MT9V032 752x480 CMOS sensor.
config VIDEO_TCM825X
tristate "TCM825x camera sensor support"
depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_INT_DEVICE
depends on MEDIA_CAMERA_SUPPORT
---help---
This is a driver for the Toshiba TCM825x VGA camera sensor.
It is used for example in Nokia N800.
config VIDEO_SR030PC30
tristate "Siliconfile SR030PC30 sensor support"
depends on I2C && VIDEO_V4L2

1
drivers/media/i2c/Makefile
View File

@ -57,7 +57,6 @@ obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o
obj-$(CONFIG_VIDEO_OV7640) += ov7640.o
obj-$(CONFIG_VIDEO_OV7670) += ov7670.o
obj-$(CONFIG_VIDEO_OV9650) += ov9650.o
obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o
obj-$(CONFIG_VIDEO_MT9M032) += mt9m032.o
obj-$(CONFIG_VIDEO_MT9P031) += mt9p031.o
obj-$(CONFIG_VIDEO_MT9T001) += mt9t001.o

7
drivers/media/platform/Kconfig
View File

@ -91,13 +91,6 @@ config VIDEO_M32R_AR_M64278
To compile this driver as a module, choose M here: the
module will be called arv.
config VIDEO_OMAP2
tristate "OMAP2 Camera Capture Interface driver"
depends on VIDEO_DEV && ARCH_OMAP2 && VIDEO_V4L2_INT_DEVICE
select VIDEOBUF_DMA_SG
---help---
This is a v4l2 driver for the TI OMAP2 camera capture interface
config VIDEO_OMAP3
tristate "OMAP 3 Camera support"
depends on OMAP_IOVMM && VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3

3
drivers/media/platform/Makefile
View File

@ -2,8 +2,6 @@
# Makefile for the video capture/playback device drivers.
#
omap2cam-objs := omap24xxcam.o omap24xxcam-dma.o
obj-$(CONFIG_VIDEO_VINO) += indycam.o
obj-$(CONFIG_VIDEO_VINO) += vino.o
@ -14,7 +12,6 @@ obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o
obj-$(CONFIG_VIDEO_CAFE_CCIC) += marvell-ccic/
obj-$(CONFIG_VIDEO_MMP_CAMERA) += marvell-ccic/
obj-$(CONFIG_VIDEO_OMAP2) += omap2cam.o
obj-$(CONFIG_VIDEO_OMAP3) += omap3isp/
obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o

11
drivers/media/v4l2-core/Kconfig
View File

@ -83,14 +83,3 @@ config VIDEOBUF2_DMA_SG
#depends on HAS_DMA
select VIDEOBUF2_CORE
select VIDEOBUF2_MEMOPS
config VIDEO_V4L2_INT_DEVICE
tristate "V4L2 int device (DEPRECATED)"
depends on VIDEO_V4L2
---help---
An early framework for a hardware-independent interface for
image sensors and bridges etc. Currently used by omap24xxcam and
tcm825x drivers that should be converted to V4L2 subdev.
Do not use for new developments.

1
drivers/media/v4l2-core/Makefile
View File

@ -15,7 +15,6 @@ ifeq ($(CONFIG_OF),y)
endif
obj-$(CONFIG_VIDEO_V4L2) += videodev.o
obj-$(CONFIG_VIDEO_V4L2_INT_DEVICE) += v4l2-int-device.o
obj-$(CONFIG_VIDEO_V4L2) += v4l2-common.o
obj-$(CONFIG_VIDEO_V4L2) += v4l2-dv-timings.o

2
drivers/staging/media/Kconfig
View File

@ -33,6 +33,8 @@ source "drivers/staging/media/go7007/Kconfig"
source "drivers/staging/media/msi3101/Kconfig"
source "drivers/staging/media/omap24xx/Kconfig"
source "drivers/staging/media/sn9c102/Kconfig"
source "drivers/staging/media/solo6x10/Kconfig"

2
drivers/staging/media/Makefile
View File

@ -9,3 +9,5 @@ obj-$(CONFIG_USB_MSI3101) += msi3101/
obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/
obj-$(CONFIG_VIDEO_OMAP4) += omap4iss/
obj-$(CONFIG_USB_SN9C102) += sn9c102/
obj-$(CONFIG_VIDEO_OMAP2) += omap24xx/
obj-$(CONFIG_VIDEO_TCM825X) += omap24xx/

35
drivers/staging/media/omap24xx/Kconfig Normal file
View File

@ -0,0 +1,35 @@
config VIDEO_V4L2_INT_DEVICE
tristate
config VIDEO_OMAP2
tristate "OMAP2 Camera Capture Interface driver (DEPRECATED)"
depends on VIDEO_DEV && ARCH_OMAP2
select VIDEOBUF_DMA_SG
select VIDEO_V4L2_INT_DEVICE
---help---
This is a v4l2 driver for the TI OMAP2 camera capture interface
It uses the deprecated int-device API. Since this driver is no
longer actively maintained and nobody is interested in converting
it to the subdev API, this driver will be removed soon.
If you do want to keep this driver in the kernel, and are willing
to convert it to the subdev API, then please contact the linux-media
mailinglist.
config VIDEO_TCM825X
tristate "TCM825x camera sensor support (DEPRECATED)"
depends on I2C && VIDEO_V4L2
depends on MEDIA_CAMERA_SUPPORT
select VIDEO_V4L2_INT_DEVICE
---help---
This is a driver for the Toshiba TCM825x VGA camera sensor.
It is used for example in Nokia N800.
It uses the deprecated int-device API. Since this driver is no
longer actively maintained and nobody is interested in converting
it to the subdev API, this driver will be removed soon.
If you do want to keep this driver in the kernel, and are willing
to convert it to the subdev API, then please contact the linux-media
mailinglist.

5
drivers/staging/media/omap24xx/Makefile Normal file
View File

@ -0,0 +1,5 @@
omap2cam-objs := omap24xxcam.o omap24xxcam-dma.o
obj-$(CONFIG_VIDEO_OMAP2) += omap2cam.o
obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o
obj-$(CONFIG_VIDEO_V4L2_INT_DEVICE) += v4l2-int-device.o

0
drivers/media/platform/omap24xxcam-dma.c → drivers/staging/media/omap24xx/omap24xxcam-dma.c
View File

0
drivers/media/platform/omap24xxcam.c → drivers/staging/media/omap24xx/omap24xxcam.c
View File

2
drivers/media/platform/omap24xxcam.h → drivers/staging/media/omap24xx/omap24xxcam.h
View File

@ -28,8 +28,8 @@
#define OMAP24XXCAM_H
#include <media/videobuf-dma-sg.h>
#include <media/v4l2-int-device.h>
#include <media/v4l2-device.h>
#include "v4l2-int-device.h"
/*
*

2
drivers/media/i2c/tcm825x.c → drivers/staging/media/omap24xx/tcm825x.c
View File

@ -28,7 +28,7 @@
#include <linux/i2c.h>
#include <linux/module.h>
#include <media/v4l2-int-device.h>
#include "v4l2-int-device.h"
#include "tcm825x.h"

2
drivers/media/i2c/tcm825x.h → drivers/staging/media/omap24xx/tcm825x.h
View File

@ -17,7 +17,7 @@
#include <linux/videodev2.h>
#include <media/v4l2-int-device.h>
#include "v4l2-int-device.h"
#define TCM825X_NAME "tcm825x"

2
drivers/media/v4l2-core/v4l2-int-device.c → drivers/staging/media/omap24xx/v4l2-int-device.c
View File

@ -28,7 +28,7 @@
#include <linux/string.h>
#include <linux/module.h>
#include <media/v4l2-int-device.h>
#include "v4l2-int-device.h"
static DEFINE_MUTEX(mutex);
static LIST_HEAD(int_list);

0
include/media/v4l2-int-device.h → drivers/staging/media/omap24xx/v4l2-int-device.h
View File