V4L/DVB (11207): pvrusb2: Add composite and s-video input support for OnAir devices

Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

7 files changed, 160 insertions, 2 deletions

diff --git a/drivers/media/video/pvrusb2/Makefile b/drivers/media/video/pvrusb2/Makefile
index a4478618a7fc..de2fc14f043b 100644
--- a/drivers/media/video/pvrusb2/Makefile
+++ b/drivers/media/video/pvrusb2/Makefile
@@ -10,6 +10,7 @@ pvrusb2-objs	:= pvrusb2-i2c-core.o \
                    pvrusb2-ctrl.o pvrusb2-std.o pvrusb2-devattr.o \
                    pvrusb2-context.o pvrusb2-io.o pvrusb2-ioread.o \
                    pvrusb2-cx2584x-v4l.o pvrusb2-wm8775.o \
+                   pvrusb2-cs53l32a.o \
                    $(obj-pvrusb2-dvb-y) \
                    $(obj-pvrusb2-sysfs-y) $(obj-pvrusb2-debugifc-y)
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c b/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c
new file mode 100644
index 000000000000..b5c3428ebb9f
--- /dev/null
+++ b/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c
@@ -0,0 +1,95 @@
+/*
+ *
+ *
+ *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
+ *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+/*
+
+   This source file is specifically designed to interface with the
+   v4l-dvb cs53l32a module.
+
+*/
+
+#include "pvrusb2-cs53l32a.h"
+
+
+#include "pvrusb2-hdw-internal.h"
+#include "pvrusb2-debug.h"
+#include <linux/videodev2.h>
+#include <media/v4l2-common.h>
+#include <linux/errno.h>
+#include <linux/slab.h>
+
+struct routing_scheme {
+        const int *def;
+        unsigned int cnt;
+};
+
+
+static const int routing_scheme1[] = {
+        [PVR2_CVAL_INPUT_TV] = 2,  /* 1 or 2 seems to work here */
+        [PVR2_CVAL_INPUT_RADIO] = 2,
+        [PVR2_CVAL_INPUT_COMPOSITE] = 0,
+        [PVR2_CVAL_INPUT_SVIDEO] =  0,
+};
+
+static const struct routing_scheme routing_schemes[] = {
+        [PVR2_ROUTING_SCHEME_ONAIR] = {
+                .def = routing_scheme1,
+                .cnt = ARRAY_SIZE(routing_scheme1),
+        },
+};
+
+
+void pvr2_cs53l32a_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
+{
+        if (hdw->input_dirty || hdw->force_dirty) {
+                struct v4l2_routing route;
+                const struct routing_scheme *sp;
+                unsigned int sid = hdw->hdw_desc->signal_routing_scheme;
+                pvr2_trace(PVR2_TRACE_CHIPS, "subdev v4l2 set_input(%d)",
+                           hdw->input_val);
+                if ((sid < ARRAY_SIZE(routing_schemes)) &&
+                    ((sp = routing_schemes + sid) != NULL) &&
+                    (hdw->input_val >= 0) &&
+                    (hdw->input_val < sp->cnt)) {
+                        route.input = sp->def[hdw->input_val];
+                } else {
+                        pvr2_trace(PVR2_TRACE_ERROR_LEGS,
+                                   "*** WARNING *** subdev v4l2 set_input:"
+                                   " Invalid routing scheme (%u)"
+                                   " and/or input (%d)",
+                                   sid, hdw->input_val);
+                        return;
+                }
+                route.output = 0;
+                sd->ops->audio->s_routing(sd, &route);
+        }
+}
+
+
+/*
+  Stuff for Emacs to see, in order to encourage consistent editing style:
+  *** Local Variables: ***
+  *** mode: c ***
+  *** fill-column: 70 ***
+  *** tab-width: 8 ***
+  *** c-basic-offset: 8 ***
+  *** End: ***
+  */
diff --git a/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.h b/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.h
new file mode 100644
index 000000000000..53ba548b72a7
--- /dev/null
+++ b/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.h
@@ -0,0 +1,48 @@
+/*
+ *
+ *
+ *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
+ *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#ifndef __PVRUSB2_CS53L32A_H
+#define __PVRUSB2_CS53L32A_H
+
+/*
+
+   This module connects the pvrusb2 driver to the I2C chip level
+   driver which handles device video processing.  This interface is
+   used internally by the driver; higher level code should only
+   interact through the interface provided by pvrusb2-hdw.h.
+
+*/
+
+
+#include "pvrusb2-hdw-internal.h"
+void pvr2_cs53l32a_subdev_update(struct pvr2_hdw *, struct v4l2_subdev *);
+
+#endif /* __PVRUSB2_AUDIO_CS53L32A_H */
+
+/*
+  Stuff for Emacs to see, in order to encourage consistent editing style:
+  *** Local Variables: ***
+  *** mode: c ***
+  *** fill-column: 70 ***
+  *** tab-width: 8 ***
+  *** c-basic-offset: 8 ***
+  *** End: ***
+  */
diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
index 7483c1746079..1cb6a260e8b0 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
@@ -205,7 +205,7 @@ static const struct pvr2_device_desc pvr2_device_onair_creator = {
                 .flag_has_composite = !0,
                 .flag_has_svideo = !0,
                 .flag_digital_requires_cx23416 = !0,
-                .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
+                .signal_routing_scheme = PVR2_ROUTING_SCHEME_ONAIR,
                 .digital_control_scheme = PVR2_DIGITAL_SCHEME_ONAIR,
                 .default_std_mask = V4L2_STD_NTSC_M,
 #ifdef CONFIG_VIDEO_PVRUSB2_DVB
@@ -265,7 +265,7 @@ static const struct pvr2_device_desc pvr2_device_onair_usb2 = {
                 .flag_has_composite = !0,
                 .flag_has_svideo = !0,
                 .flag_digital_requires_cx23416 = !0,
-                .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
+                .signal_routing_scheme = PVR2_ROUTING_SCHEME_ONAIR,
                 .digital_control_scheme = PVR2_DIGITAL_SCHEME_ONAIR,
                 .default_std_mask = V4L2_STD_NTSC_M,
 #ifdef CONFIG_VIDEO_PVRUSB2_DVB
diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.h b/drivers/media/video/pvrusb2/pvrusb2-devattr.h
index 13a59c4f9584..3e553389cbc3 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-devattr.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.h
@@ -68,6 +68,7 @@ struct pvr2_string_table {
 
 #define PVR2_ROUTING_SCHEME_HAUPPAUGE 0
 #define PVR2_ROUTING_SCHEME_GOTVIEW 1
+#define PVR2_ROUTING_SCHEME_ONAIR 2
 
 #define PVR2_DIGITAL_SCHEME_NONE 0
 #define PVR2_DIGITAL_SCHEME_HAUPPAUGE 1
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index b8a2d332c6d0..e35772125038 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -38,6 +38,7 @@
 #include "pvrusb2-wm8775.h"
 #include "pvrusb2-video-v4l.h"
 #include "pvrusb2-cx2584x-v4l.h"
+#include "pvrusb2-cs53l32a.h"
 #include "pvrusb2-audio.h"
 
 #define TV_MIN_FREQ     55250000L
@@ -116,6 +117,7 @@ static const pvr2_subdev_update_func pvr2_module_update_functions[] = {
         [PVR2_CLIENT_ID_SAA7115] = pvr2_saa7115_subdev_update,
         [PVR2_CLIENT_ID_MSP3400] = pvr2_msp3400_subdev_update,
         [PVR2_CLIENT_ID_CX25840] = pvr2_cx25840_subdev_update,
+        [PVR2_CLIENT_ID_CS53L32A] = pvr2_cs53l32a_subdev_update,
 };
 
 static const char *module_names[] = {
diff --git a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
index ce8332dd9cc9..b3862f5554bd 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
@@ -54,11 +54,22 @@ static const int routing_scheme0[] = {
         [PVR2_CVAL_INPUT_SVIDEO] =  SAA7115_SVIDEO2,
 };
 
+static const int routing_scheme1[] = {
+        [PVR2_CVAL_INPUT_TV] = SAA7115_COMPOSITE4,
+        [PVR2_CVAL_INPUT_RADIO] = SAA7115_COMPOSITE5,
+        [PVR2_CVAL_INPUT_COMPOSITE] = SAA7115_COMPOSITE3,
+        [PVR2_CVAL_INPUT_SVIDEO] =  SAA7115_SVIDEO2, /* or SVIDEO0, it seems */
+};
+
 static const struct routing_scheme routing_schemes[] = {
         [PVR2_ROUTING_SCHEME_HAUPPAUGE] = {
                 .def = routing_scheme0,
                 .cnt = ARRAY_SIZE(routing_scheme0),
         },
+        [PVR2_ROUTING_SCHEME_ONAIR] = {
+                .def = routing_scheme1,
+                .cnt = ARRAY_SIZE(routing_scheme1),
+        },
 };
 
 void pvr2_saa7115_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)