Commit b6f21dc3 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

[media] cx25821: remove video output support

The video output functionality never worked for this driver. Now remove the
creation of the output video nodes as well to prevent users from thinking
that video output is available, when it isn't.

To correctly implement this the video output should use vb2 as well, and
that requires rewriting the output DMA setup. But without hardware to test
I am not able to do that.
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 11c8a2df
cx25821-y := cx25821-core.o cx25821-cards.o cx25821-i2c.o \ cx25821-y := cx25821-core.o cx25821-cards.o cx25821-i2c.o \
cx25821-gpio.o cx25821-medusa-video.o \ cx25821-gpio.o cx25821-medusa-video.o \
cx25821-video.o cx25821-video-upstream.o cx25821-video.o
obj-$(CONFIG_VIDEO_CX25821) += cx25821.o obj-$(CONFIG_VIDEO_CX25821) += cx25821.o
obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o
......
...@@ -965,11 +965,15 @@ void cx25821_dev_unregister(struct cx25821_dev *dev) ...@@ -965,11 +965,15 @@ void cx25821_dev_unregister(struct cx25821_dev *dev)
release_mem_region(dev->base_io_addr, pci_resource_len(dev->pci, 0)); release_mem_region(dev->base_io_addr, pci_resource_len(dev->pci, 0));
for (i = 0; i < MAX_VID_CHANNEL_NUM - 1; i++) { for (i = 0; i < MAX_VID_CAP_CHANNEL_NUM - 1; i++) {
if (i == SRAM_CH08) /* audio channel */ if (i == SRAM_CH08) /* audio channel */
continue; continue;
/*
* TODO: enable when video output is properly
* supported.
if (i == SRAM_CH09 || i == SRAM_CH10) if (i == SRAM_CH09 || i == SRAM_CH10)
cx25821_free_mem_upstream(&dev->channels[i]); cx25821_free_mem_upstream(&dev->channels[i]);
*/
cx25821_video_unregister(dev, i); cx25821_video_unregister(dev, i);
} }
......
...@@ -692,7 +692,7 @@ int cx25821_video_register(struct cx25821_dev *dev) ...@@ -692,7 +692,7 @@ int cx25821_video_register(struct cx25821_dev *dev)
spin_lock_init(&dev->slock); spin_lock_init(&dev->slock);
for (i = 0; i < MAX_VID_CHANNEL_NUM - 1; ++i) { for (i = 0; i < MAX_VID_CAP_CHANNEL_NUM - 1; ++i) {
struct cx25821_channel *chan = &dev->channels[i]; struct cx25821_channel *chan = &dev->channels[i];
struct video_device *vdev = &chan->vdev; struct video_device *vdev = &chan->vdev;
struct v4l2_ctrl_handler *hdl = &chan->hdl; struct v4l2_ctrl_handler *hdl = &chan->hdl;
......
...@@ -88,6 +88,13 @@ ...@@ -88,6 +88,13 @@
#define CX25821_BOARD_CONEXANT_ATHENA10 1 #define CX25821_BOARD_CONEXANT_ATHENA10 1
#define MAX_VID_CHANNEL_NUM 12 #define MAX_VID_CHANNEL_NUM 12
/*
* Maximum capture-only channels. This can go away once video/audio output
* is fully supported in this driver.
*/
#define MAX_VID_CAP_CHANNEL_NUM 10
#define VID_CHANNEL_NUM 8 #define VID_CHANNEL_NUM 8
struct cx25821_fmt { struct cx25821_fmt {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment