* [RFCv2 PATCH 0/2] Move sn9c102 and omap24xx/tcm825x to staging.
@ 2013-12-12 12:26 Hans Verkuil
2013-12-12 12:26 ` [RFCv2 PATCH 1/2] sn9c102: prepare for removal by moving it " Hans Verkuil
2013-12-12 12:26 ` [RFCv2 PATCH 2/2] omap24xx/tcm825x: move to staging for future removal Hans Verkuil
0 siblings, 2 replies; 6+ messages in thread
From: Hans Verkuil @ 2013-12-12 12:26 UTC (permalink / raw)
To: linux-media
[Repost, this time with rename-detection turned on...]
This RFC patch series moves sn9c102 and omap24xx/tcm825x to staging.
The sn9c102 driver has been deprecated for quite some time and most of the
supported webcams are now part of gspca. Nobody has the hardware for the
remaining webcams and nobody is actively maintaining this driver.
Converting this driver to the v4l2 frameworks would be a major undertaking.
This driver is no longer part of Fedora for some time now without ever
receiving any complaints, so instead of updating it it is a better idea to
phase it out. Step one of that process is to move it to staging.
This decision was taken during the last media summit in Edinburgh.
The second patch moves the omap24xx and tcm825x to staging, together with
the v4l2-int-device source. These drivers are the only ones that use that
old int-device API, nobody is actively maintaining these any more, and
attempts to convert them to the subdev API have failed (it compiles, but
it crashes and nobody has the time to chase the problem).
I really want to get rid of v4l2-int-device, especially since there are
some platforms out there (MXC) that still use it. None of the drivers based
on int-device can ever be upstreamed, so I am hoping that just removing this
deprecated API altogether will finally convince the maintainers of those
out-of-tree platforms to switch to a modern API.
Moving these drivers to staging is the first step and my plan is to
remove it completely second half of 2014. A nice side-effect of moving
the v4l2-int-device source and header to staging is also that nobody
can use v4l2-int-device.h anymore in another driver since it is no longer
part of the include directory.
Regards,
Hans
^ permalink raw reply [flat|nested] 6+ messages in thread
* [RFCv2 PATCH 1/2] sn9c102: prepare for removal by moving it to staging.
2013-12-12 12:26 [RFCv2 PATCH 0/2] Move sn9c102 and omap24xx/tcm825x to staging Hans Verkuil
@ 2013-12-12 12:26 ` Hans Verkuil
2013-12-12 12:26 ` [RFCv2 PATCH 2/2] omap24xx/tcm825x: move to staging for future removal Hans Verkuil
1 sibling, 0 replies; 6+ messages in thread
From: Hans Verkuil @ 2013-12-12 12:26 UTC (permalink / raw)
To: linux-media; +Cc: Hans Verkuil, Hans de Goede, Luca Risolia
From: Hans Verkuil <hans.verkuil@cisco.com>
During the last media summit meeting it was decided to move this driver to
staging as the first step to removing it altogether.
Most webcams covered by this driver are now supported by gspca. Nobody has the
hardware to convert the remaining devices to gspca.
This driver needs a major overhaul to have it conform to the latest frameworks
and compliancy tests.
Without hardware, however, this is next to impossible. Given the fact that
this driver seems to be pretty much unused (it has been removed from Fedora
several versions ago and nobody complained about that), we decided to drop
this driver.
This patch moves it to staging. Some time in 2014 we will drop it completely.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Luca Risolia <luca.risolia@studio.unibo.it>
---
MAINTAINERS | 3 +--
drivers/media/usb/Kconfig | 1 -
drivers/media/usb/Makefile | 1 -
drivers/staging/media/Kconfig | 2 ++
drivers/staging/media/Makefile | 1 +
drivers/{media/usb => staging/media}/sn9c102/Kconfig | 7 +++++--
drivers/{media/usb => staging/media}/sn9c102/Makefile | 0
drivers/{media/usb => staging/media}/sn9c102/sn9c102.h | 0
.../video4linux => drivers/staging/media/sn9c102}/sn9c102.txt | 0
drivers/{media/usb => staging/media}/sn9c102/sn9c102_config.h | 0
drivers/{media/usb => staging/media}/sn9c102/sn9c102_core.c | 0
drivers/{media/usb => staging/media}/sn9c102/sn9c102_devtable.h | 0
drivers/{media/usb => staging/media}/sn9c102/sn9c102_hv7131d.c | 0
drivers/{media/usb => staging/media}/sn9c102/sn9c102_hv7131r.c | 0
drivers/{media/usb => staging/media}/sn9c102/sn9c102_mi0343.c | 0
drivers/{media/usb => staging/media}/sn9c102/sn9c102_mi0360.c | 0
drivers/{media/usb => staging/media}/sn9c102/sn9c102_mt9v111.c | 0
drivers/{media/usb => staging/media}/sn9c102/sn9c102_ov7630.c | 0
drivers/{media/usb => staging/media}/sn9c102/sn9c102_ov7660.c | 0
drivers/{media/usb => staging/media}/sn9c102/sn9c102_pas106b.c | 0
drivers/{media/usb => staging/media}/sn9c102/sn9c102_pas202bcb.c | 0
drivers/{media/usb => staging/media}/sn9c102/sn9c102_sensor.h | 0
drivers/{media/usb => staging/media}/sn9c102/sn9c102_tas5110c1b.c | 0
drivers/{media/usb => staging/media}/sn9c102/sn9c102_tas5110d.c | 0
drivers/{media/usb => staging/media}/sn9c102/sn9c102_tas5130d1b.c | 0
25 files changed, 9 insertions(+), 6 deletions(-)
rename drivers/{media/usb => staging/media}/sn9c102/Kconfig (58%)
rename drivers/{media/usb => staging/media}/sn9c102/Makefile (100%)
rename drivers/{media/usb => staging/media}/sn9c102/sn9c102.h (100%)
rename {Documentation/video4linux => drivers/staging/media/sn9c102}/sn9c102.txt (100%)
rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_config.h (100%)
rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_core.c (100%)
rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_devtable.h (100%)
rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_hv7131d.c (100%)
rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_hv7131r.c (100%)
rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_mi0343.c (100%)
rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_mi0360.c (100%)
rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_mt9v111.c (100%)
rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_ov7630.c (100%)
rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_ov7660.c (100%)
rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_pas106b.c (100%)
rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_pas202bcb.c (100%)
rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_sensor.h (100%)
rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_tas5110c1b.c (100%)
rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_tas5110d.c (100%)
rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_tas5130d1b.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 8285ed4..5883b52 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9017,8 +9017,7 @@ L: linux-media@vger.kernel.org
T: git git://linuxtv.org/media_tree.git
W: http://www.linux-projects.org
S: Maintained
-F: Documentation/video4linux/sn9c102.txt
-F: drivers/media/usb/sn9c102/
+F: drivers/staging/media/sn9c102/
USB SUBSYSTEM
M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig
index cfe8056..39d824e 100644
--- a/drivers/media/usb/Kconfig
+++ b/drivers/media/usb/Kconfig
@@ -17,7 +17,6 @@ source "drivers/media/usb/cpia2/Kconfig"
source "drivers/media/usb/zr364xx/Kconfig"
source "drivers/media/usb/stkwebcam/Kconfig"
source "drivers/media/usb/s2255/Kconfig"
-source "drivers/media/usb/sn9c102/Kconfig"
source "drivers/media/usb/usbtv/Kconfig"
endif
diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile
index 0935f47..7ac4b14 100644
--- a/drivers/media/usb/Makefile
+++ b/drivers/media/usb/Makefile
@@ -10,7 +10,6 @@ obj-$(CONFIG_USB_VIDEO_CLASS) += uvc/
obj-$(CONFIG_USB_GSPCA) += gspca/
obj-$(CONFIG_USB_PWC) += pwc/
obj-$(CONFIG_VIDEO_CPIA2) += cpia2/
-obj-$(CONFIG_USB_SN9C102) += sn9c102/
obj-$(CONFIG_VIDEO_AU0828) += au0828/
obj-$(CONFIG_VIDEO_HDPVR) += hdpvr/
obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 7728879..6a20217 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -33,6 +33,8 @@ source "drivers/staging/media/go7007/Kconfig"
source "drivers/staging/media/msi3101/Kconfig"
+source "drivers/staging/media/sn9c102/Kconfig"
+
source "drivers/staging/media/solo6x10/Kconfig"
source "drivers/staging/media/omap4iss/Kconfig"
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 0bd1a88..2a15451 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -8,3 +8,4 @@ obj-$(CONFIG_VIDEO_GO7007) += go7007/
obj-$(CONFIG_USB_MSI3101) += msi3101/
obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/
obj-$(CONFIG_VIDEO_OMAP4) += omap4iss/
+obj-$(CONFIG_USB_SN9C102) += sn9c102/
diff --git a/drivers/media/usb/sn9c102/Kconfig b/drivers/staging/media/sn9c102/Kconfig
similarity index 58%
rename from drivers/media/usb/sn9c102/Kconfig
rename to drivers/staging/media/sn9c102/Kconfig
index 6ebaf29..d8ae235 100644
--- a/drivers/media/usb/sn9c102/Kconfig
+++ b/drivers/staging/media/sn9c102/Kconfig
@@ -2,13 +2,16 @@ config USB_SN9C102
tristate "USB SN9C1xx PC Camera Controller support (DEPRECATED)"
depends on VIDEO_V4L2
---help---
- This driver is DEPRECATED please use the gspca sonixb and
+ This driver is DEPRECATED, please use the gspca sonixb and
sonixj modules instead.
Say Y here if you want support for cameras based on SONiX SN9C101,
SN9C102, SN9C103, SN9C105 and SN9C120 PC Camera Controllers.
- See <file:Documentation/video4linux/sn9c102.txt> for more info.
+ See <file:drivers/staging/media/sn9c102/sn9c102.txt> for more info.
+
+ If you have webcams that are only supported by this driver and not by
+ the gspca driver, then contact the linux-media mailinglist.
To compile this driver as a module, choose M here: the
module will be called sn9c102.
diff --git a/drivers/media/usb/sn9c102/Makefile b/drivers/staging/media/sn9c102/Makefile
similarity index 100%
rename from drivers/media/usb/sn9c102/Makefile
rename to drivers/staging/media/sn9c102/Makefile
diff --git a/drivers/media/usb/sn9c102/sn9c102.h b/drivers/staging/media/sn9c102/sn9c102.h
similarity index 100%
rename from drivers/media/usb/sn9c102/sn9c102.h
rename to drivers/staging/media/sn9c102/sn9c102.h
diff --git a/Documentation/video4linux/sn9c102.txt b/drivers/staging/media/sn9c102/sn9c102.txt
similarity index 100%
rename from Documentation/video4linux/sn9c102.txt
rename to drivers/staging/media/sn9c102/sn9c102.txt
diff --git a/drivers/media/usb/sn9c102/sn9c102_config.h b/drivers/staging/media/sn9c102/sn9c102_config.h
similarity index 100%
rename from drivers/media/usb/sn9c102/sn9c102_config.h
rename to drivers/staging/media/sn9c102/sn9c102_config.h
diff --git a/drivers/media/usb/sn9c102/sn9c102_core.c b/drivers/staging/media/sn9c102/sn9c102_core.c
similarity index 100%
rename from drivers/media/usb/sn9c102/sn9c102_core.c
rename to drivers/staging/media/sn9c102/sn9c102_core.c
diff --git a/drivers/media/usb/sn9c102/sn9c102_devtable.h b/drivers/staging/media/sn9c102/sn9c102_devtable.h
similarity index 100%
rename from drivers/media/usb/sn9c102/sn9c102_devtable.h
rename to drivers/staging/media/sn9c102/sn9c102_devtable.h
diff --git a/drivers/media/usb/sn9c102/sn9c102_hv7131d.c b/drivers/staging/media/sn9c102/sn9c102_hv7131d.c
similarity index 100%
rename from drivers/media/usb/sn9c102/sn9c102_hv7131d.c
rename to drivers/staging/media/sn9c102/sn9c102_hv7131d.c
diff --git a/drivers/media/usb/sn9c102/sn9c102_hv7131r.c b/drivers/staging/media/sn9c102/sn9c102_hv7131r.c
similarity index 100%
rename from drivers/media/usb/sn9c102/sn9c102_hv7131r.c
rename to drivers/staging/media/sn9c102/sn9c102_hv7131r.c
diff --git a/drivers/media/usb/sn9c102/sn9c102_mi0343.c b/drivers/staging/media/sn9c102/sn9c102_mi0343.c
similarity index 100%
rename from drivers/media/usb/sn9c102/sn9c102_mi0343.c
rename to drivers/staging/media/sn9c102/sn9c102_mi0343.c
diff --git a/drivers/media/usb/sn9c102/sn9c102_mi0360.c b/drivers/staging/media/sn9c102/sn9c102_mi0360.c
similarity index 100%
rename from drivers/media/usb/sn9c102/sn9c102_mi0360.c
rename to drivers/staging/media/sn9c102/sn9c102_mi0360.c
diff --git a/drivers/media/usb/sn9c102/sn9c102_mt9v111.c b/drivers/staging/media/sn9c102/sn9c102_mt9v111.c
similarity index 100%
rename from drivers/media/usb/sn9c102/sn9c102_mt9v111.c
rename to drivers/staging/media/sn9c102/sn9c102_mt9v111.c
diff --git a/drivers/media/usb/sn9c102/sn9c102_ov7630.c b/drivers/staging/media/sn9c102/sn9c102_ov7630.c
similarity index 100%
rename from drivers/media/usb/sn9c102/sn9c102_ov7630.c
rename to drivers/staging/media/sn9c102/sn9c102_ov7630.c
diff --git a/drivers/media/usb/sn9c102/sn9c102_ov7660.c b/drivers/staging/media/sn9c102/sn9c102_ov7660.c
similarity index 100%
rename from drivers/media/usb/sn9c102/sn9c102_ov7660.c
rename to drivers/staging/media/sn9c102/sn9c102_ov7660.c
diff --git a/drivers/media/usb/sn9c102/sn9c102_pas106b.c b/drivers/staging/media/sn9c102/sn9c102_pas106b.c
similarity index 100%
rename from drivers/media/usb/sn9c102/sn9c102_pas106b.c
rename to drivers/staging/media/sn9c102/sn9c102_pas106b.c
diff --git a/drivers/media/usb/sn9c102/sn9c102_pas202bcb.c b/drivers/staging/media/sn9c102/sn9c102_pas202bcb.c
similarity index 100%
rename from drivers/media/usb/sn9c102/sn9c102_pas202bcb.c
rename to drivers/staging/media/sn9c102/sn9c102_pas202bcb.c
diff --git a/drivers/media/usb/sn9c102/sn9c102_sensor.h b/drivers/staging/media/sn9c102/sn9c102_sensor.h
similarity index 100%
rename from drivers/media/usb/sn9c102/sn9c102_sensor.h
rename to drivers/staging/media/sn9c102/sn9c102_sensor.h
diff --git a/drivers/media/usb/sn9c102/sn9c102_tas5110c1b.c b/drivers/staging/media/sn9c102/sn9c102_tas5110c1b.c
similarity index 100%
rename from drivers/media/usb/sn9c102/sn9c102_tas5110c1b.c
rename to drivers/staging/media/sn9c102/sn9c102_tas5110c1b.c
diff --git a/drivers/media/usb/sn9c102/sn9c102_tas5110d.c b/drivers/staging/media/sn9c102/sn9c102_tas5110d.c
similarity index 100%
rename from drivers/media/usb/sn9c102/sn9c102_tas5110d.c
rename to drivers/staging/media/sn9c102/sn9c102_tas5110d.c
diff --git a/drivers/media/usb/sn9c102/sn9c102_tas5130d1b.c b/drivers/staging/media/sn9c102/sn9c102_tas5130d1b.c
similarity index 100%
rename from drivers/media/usb/sn9c102/sn9c102_tas5130d1b.c
rename to drivers/staging/media/sn9c102/sn9c102_tas5130d1b.c
--
1.8.4.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [RFCv2 PATCH 2/2] omap24xx/tcm825x: move to staging for future removal.
2013-12-12 12:26 [RFCv2 PATCH 0/2] Move sn9c102 and omap24xx/tcm825x to staging Hans Verkuil
2013-12-12 12:26 ` [RFCv2 PATCH 1/2] sn9c102: prepare for removal by moving it " Hans Verkuil
@ 2013-12-12 12:26 ` Hans Verkuil
2013-12-13 11:29 ` Sakari Ailus
1 sibling, 1 reply; 6+ messages in thread
From: Hans Verkuil @ 2013-12-12 12:26 UTC (permalink / raw)
To: linux-media; +Cc: Hans Verkuil, Sakari Ailus, David Cohen
From: Hans Verkuil <hans.verkuil@cisco.com>
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.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Sakari Ailus <sakari.ailus@iki.fi>
Cc: David Cohen <dacohen@gmail.com>
---
drivers/media/i2c/Kconfig | 8 -----
drivers/media/i2c/Makefile | 1 -
drivers/media/platform/Kconfig | 7 -----
drivers/media/platform/Makefile | 3 --
drivers/media/v4l2-core/Kconfig | 11 -------
drivers/media/v4l2-core/Makefile | 1 -
drivers/staging/media/Kconfig | 2 ++
drivers/staging/media/Makefile | 2 ++
drivers/staging/media/omap24xx/Kconfig | 35 ++++++++++++++++++++++
drivers/staging/media/omap24xx/Makefile | 5 ++++
.../media/omap24xx}/omap24xxcam-dma.c | 0
.../media/omap24xx}/omap24xxcam.c | 0
.../media/omap24xx}/omap24xxcam.h | 2 +-
.../i2c => staging/media/omap24xx}/tcm825x.c | 2 +-
.../i2c => staging/media/omap24xx}/tcm825x.h | 2 +-
.../media/omap24xx}/v4l2-int-device.c | 2 +-
.../staging/media/omap24xx}/v4l2-int-device.h | 0
17 files changed, 48 insertions(+), 35 deletions(-)
create mode 100644 drivers/staging/media/omap24xx/Kconfig
create mode 100644 drivers/staging/media/omap24xx/Makefile
rename drivers/{media/platform => staging/media/omap24xx}/omap24xxcam-dma.c (100%)
rename drivers/{media/platform => staging/media/omap24xx}/omap24xxcam.c (100%)
rename drivers/{media/platform => staging/media/omap24xx}/omap24xxcam.h (99%)
rename drivers/{media/i2c => staging/media/omap24xx}/tcm825x.c (99%)
rename drivers/{media/i2c => staging/media/omap24xx}/tcm825x.h (99%)
rename drivers/{media/v4l2-core => staging/media/omap24xx}/v4l2-int-device.c (99%)
rename {include/media => drivers/staging/media/omap24xx}/v4l2-int-device.h (100%)
diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index 842654d..997cd66 100644
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -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
diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
index e03f177..abd25e3 100644
--- a/drivers/media/i2c/Makefile
+++ b/drivers/media/i2c/Makefile
@@ -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
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 7f6ea65..b2a4403 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -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
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 1348ba1..e5269da 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -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
diff --git a/drivers/media/v4l2-core/Kconfig b/drivers/media/v4l2-core/Kconfig
index 8c05565..2189bfb 100644
--- a/drivers/media/v4l2-core/Kconfig
+++ b/drivers/media/v4l2-core/Kconfig
@@ -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.
-
diff --git a/drivers/media/v4l2-core/Makefile b/drivers/media/v4l2-core/Makefile
index 1a85eee..c6ae7ba 100644
--- a/drivers/media/v4l2-core/Makefile
+++ b/drivers/media/v4l2-core/Makefile
@@ -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
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 6a20217..22b0c9d 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -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"
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 2a15451..bedc62a 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -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/
diff --git a/drivers/staging/media/omap24xx/Kconfig b/drivers/staging/media/omap24xx/Kconfig
new file mode 100644
index 0000000..82e569a
--- /dev/null
+++ b/drivers/staging/media/omap24xx/Kconfig
@@ -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.
diff --git a/drivers/staging/media/omap24xx/Makefile b/drivers/staging/media/omap24xx/Makefile
new file mode 100644
index 0000000..c2e7175
--- /dev/null
+++ b/drivers/staging/media/omap24xx/Makefile
@@ -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
diff --git a/drivers/media/platform/omap24xxcam-dma.c b/drivers/staging/media/omap24xx/omap24xxcam-dma.c
similarity index 100%
rename from drivers/media/platform/omap24xxcam-dma.c
rename to drivers/staging/media/omap24xx/omap24xxcam-dma.c
diff --git a/drivers/media/platform/omap24xxcam.c b/drivers/staging/media/omap24xx/omap24xxcam.c
similarity index 100%
rename from drivers/media/platform/omap24xxcam.c
rename to drivers/staging/media/omap24xx/omap24xxcam.c
diff --git a/drivers/media/platform/omap24xxcam.h b/drivers/staging/media/omap24xx/omap24xxcam.h
similarity index 99%
rename from drivers/media/platform/omap24xxcam.h
rename to drivers/staging/media/omap24xx/omap24xxcam.h
index 7f6f791..233bb40 100644
--- a/drivers/media/platform/omap24xxcam.h
+++ b/drivers/staging/media/omap24xx/omap24xxcam.h
@@ -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"
/*
*
diff --git a/drivers/media/i2c/tcm825x.c b/drivers/staging/media/omap24xx/tcm825x.c
similarity index 99%
rename from drivers/media/i2c/tcm825x.c
rename to drivers/staging/media/omap24xx/tcm825x.c
index 9252529..b1ae8e9 100644
--- a/drivers/media/i2c/tcm825x.c
+++ b/drivers/staging/media/omap24xx/tcm825x.c
@@ -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"
diff --git a/drivers/media/i2c/tcm825x.h b/drivers/staging/media/omap24xx/tcm825x.h
similarity index 99%
rename from drivers/media/i2c/tcm825x.h
rename to drivers/staging/media/omap24xx/tcm825x.h
index 8ebab95..e2d1bcd 100644
--- a/drivers/media/i2c/tcm825x.h
+++ b/drivers/staging/media/omap24xx/tcm825x.h
@@ -17,7 +17,7 @@
#include <linux/videodev2.h>
-#include <media/v4l2-int-device.h>
+#include "v4l2-int-device.h"
#define TCM825X_NAME "tcm825x"
diff --git a/drivers/media/v4l2-core/v4l2-int-device.c b/drivers/staging/media/omap24xx/v4l2-int-device.c
similarity index 99%
rename from drivers/media/v4l2-core/v4l2-int-device.c
rename to drivers/staging/media/omap24xx/v4l2-int-device.c
index f447349..427a890 100644
--- a/drivers/media/v4l2-core/v4l2-int-device.c
+++ b/drivers/staging/media/omap24xx/v4l2-int-device.c
@@ -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);
diff --git a/include/media/v4l2-int-device.h b/drivers/staging/media/omap24xx/v4l2-int-device.h
similarity index 100%
rename from include/media/v4l2-int-device.h
rename to drivers/staging/media/omap24xx/v4l2-int-device.h
--
1.8.4.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [RFCv2 PATCH 2/2] omap24xx/tcm825x: move to staging for future removal.
2013-12-12 12:26 ` [RFCv2 PATCH 2/2] omap24xx/tcm825x: move to staging for future removal Hans Verkuil
@ 2013-12-13 11:29 ` Sakari Ailus
2013-12-13 12:02 ` Hans Verkuil
0 siblings, 1 reply; 6+ messages in thread
From: Sakari Ailus @ 2013-12-13 11:29 UTC (permalink / raw)
To: Hans Verkuil; +Cc: linux-media, Hans Verkuil, David Cohen
Hi Hans,
On Thu, Dec 12, 2013 at 01:26:33PM +0100, Hans Verkuil wrote:
> From: Hans Verkuil <hans.verkuil@cisco.com>
>
> 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.
Do you think we should move these to staging instead of removing them right
away? These drivers have never been in a usable state in the mainline
kernel due to missing platform data. Currently they suffer from other
problems, too. I'd be surprised if they compile.
If I wanted to get them working again I'd 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, and I
think David did some work to that end.
--
Kind regards,
Sakari Ailus
e-mail: sakari.ailus@iki.fi XMPP: sailus@retiisi.org.uk
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RFCv2 PATCH 2/2] omap24xx/tcm825x: move to staging for future removal.
2013-12-13 11:29 ` Sakari Ailus
@ 2013-12-13 12:02 ` Hans Verkuil
2013-12-13 12:08 ` Sakari Ailus
0 siblings, 1 reply; 6+ messages in thread
From: Hans Verkuil @ 2013-12-13 12:02 UTC (permalink / raw)
To: Sakari Ailus; +Cc: linux-media, Hans Verkuil, David Cohen
On 12/13/2013 12:29 PM, Sakari Ailus wrote:
> Hi Hans,
>
> On Thu, Dec 12, 2013 at 01:26:33PM +0100, Hans Verkuil wrote:
>> From: Hans Verkuil <hans.verkuil@cisco.com>
>>
>> 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.
>
> Do you think we should move these to staging instead of removing them right
> away? These drivers have never been in a usable state in the mainline
> kernel due to missing platform data. Currently they suffer from other
> problems, too. I'd be surprised if they compile.
They do compile, they are part of my daily build.
>
> If I wanted to get them working again I'd 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, and I
> think David did some work to that end.
>
I think I prefer to keep them in staging for at least one kernel release (3.14)
and drop them in 3.15.
Although if the consensus is to just drop them, then I won't object :-)
Regards,
Hans
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RFCv2 PATCH 2/2] omap24xx/tcm825x: move to staging for future removal.
2013-12-13 12:02 ` Hans Verkuil
@ 2013-12-13 12:08 ` Sakari Ailus
0 siblings, 0 replies; 6+ messages in thread
From: Sakari Ailus @ 2013-12-13 12:08 UTC (permalink / raw)
To: Hans Verkuil; +Cc: linux-media, Hans Verkuil, David Cohen
Hi Hans,
On Fri, Dec 13, 2013 at 01:02:33PM +0100, Hans Verkuil wrote:
> On 12/13/2013 12:29 PM, Sakari Ailus wrote:
> > Hi Hans,
> >
> > On Thu, Dec 12, 2013 at 01:26:33PM +0100, Hans Verkuil wrote:
> >> From: Hans Verkuil <hans.verkuil@cisco.com>
> >>
> >> 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.
> >
> > Do you think we should move these to staging instead of removing them right
> > away? These drivers have never been in a usable state in the mainline
> > kernel due to missing platform data. Currently they suffer from other
> > problems, too. I'd be surprised if they compile.
>
> They do compile, they are part of my daily build.
If they compile they certainly do not function. :-)
> > If I wanted to get them working again I'd 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, and I
> > think David did some work to that end.
> >
>
> I think I prefer to keep them in staging for at least one kernel release (3.14)
> and drop them in 3.15.
>
> Although if the consensus is to just drop them, then I won't object :-)
Objections, anyone? :-)
I don't object to moving them to staging either but it'll be less hassle to
just remove them.
--
Regards,
Sakari Ailus
e-mail: sakari.ailus@iki.fi XMPP: sailus@retiisi.org.uk
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-12-13 12:08 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-12 12:26 [RFCv2 PATCH 0/2] Move sn9c102 and omap24xx/tcm825x to staging Hans Verkuil
2013-12-12 12:26 ` [RFCv2 PATCH 1/2] sn9c102: prepare for removal by moving it " Hans Verkuil
2013-12-12 12:26 ` [RFCv2 PATCH 2/2] omap24xx/tcm825x: move to staging for future removal Hans Verkuil
2013-12-13 11:29 ` Sakari Ailus
2013-12-13 12:02 ` Hans Verkuil
2013-12-13 12:08 ` Sakari Ailus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox