Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (49 commits)
  V4L/DVB (3667b): cpia2: fix function prototype
  V4L/DVB (3702): Make msp3400 routing defines more consistent
  V4L/DVB (3700): Remove obsolete commands from tvp5150.c
  V4L/DVB (3697): More msp3400 and bttv fixes
  V4L/DVB (3696): Previous change for cx2341X boards broke the remote support
  V4L/DVB (3693): Fix msp3400c and bttv stereo/mono/bilingual detection/handling
  V4L/DVB (3692): Keep experimental SLICED_VBI defines under an #if 0
  V4L/DVB (3689): Kconfig: fix VP-3054 Secondary I2C Bus build configuration menu dependencies
  V4L/DVB (3673): Fix budget-av CAM reset
  V4L/DVB (3672): Fix memory leak in dvr open
  V4L/DVB (3671): New module parameter 'tv_standard' (dvb-ttpci driver)
  V4L/DVB (3670): Fix typo in comment
  V4L/DVB (3669): Configurable dma buffer size for saa7146-based budget dvb cards
  V4L/DVB (3653h): Move usb v4l docs into Documentation/video4linux
  V4L/DVB (3667a): Fix SAP + stereo mode at msp3400
  V4L/DVB (3666): Remove trailing newlines
  V4L/DVB (3665): Add new NEC uPD64031A and uPD64083 i2c drivers
  V4L/DVB (3663): Fix msp3400c wait time and better audio mode fallbacks
  V4L/DVB (3662): Don't set msp3400c-non-existent register
  V4L/DVB (3661): Add wm8739 stereo audio ADC i2c driver
  ...

7 files changed, 278 insertions, 87 deletions

diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index af2d6155d3fe..d7670ec1ec1e 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -966,66 +966,17 @@ struct v4l2_sliced_vbi_format
 
 /* Teletext World System Teletext
    (WST), defined on ITU-R BT.653-2 */
-#define V4L2_SLICED_TELETEXT_PAL_B      (0x000001)
-#define V4L2_SLICED_TELETEXT_PAL_C      (0x000002)
-#define V4L2_SLICED_TELETEXT_NTSC_B     (0x000010)
-#define V4L2_SLICED_TELETEXT_SECAM      (0x000020)
-
-/* Teletext North American Broadcast Teletext Specification
-   (NABTS), defined on ITU-R BT.653-2 */
-#define V4L2_SLICED_TELETEXT_NTSC_C     (0x000040)
-#define V4L2_SLICED_TELETEXT_NTSC_D     (0x000080)
-
+#define V4L2_SLICED_TELETEXT_B          (0x0001)
 /* Video Program System, defined on ETS 300 231*/
-#define V4L2_SLICED_VPS                 (0x000400)
-
+#define V4L2_SLICED_VPS                 (0x0400)
 /* Closed Caption, defined on EIA-608 */
-#define V4L2_SLICED_CAPTION_525         (0x001000)
-#define V4L2_SLICED_CAPTION_625         (0x002000)
-
+#define V4L2_SLICED_CAPTION_525         (0x1000)
 /* Wide Screen System, defined on ITU-R BT1119.1 */
-#define V4L2_SLICED_WSS_625             (0x004000)
-
-/* Wide Screen System, defined on IEC 61880 */
-#define V4L2_SLICED_WSS_525             (0x008000)
-
-/* Vertical Interval Timecode (VITC), defined on SMPTE 12M */
-#define V4l2_SLICED_VITC_625            (0x010000)
-#define V4l2_SLICED_VITC_525            (0x020000)
-
-#define V4L2_SLICED_TELETEXT_B          (V4L2_SLICED_TELETEXT_PAL_B  |\
-                                         V4L2_SLICED_TELETEXT_NTSC_B)
-
-#define V4L2_SLICED_TELETEXT            (V4L2_SLICED_TELETEXT_PAL_B  |\
-                                         V4L2_SLICED_TELETEXT_PAL_C  |\
-                                         V4L2_SLICED_TELETEXT_SECAM  |\
-                                         V4L2_SLICED_TELETEXT_NTSC_B |\
-                                         V4L2_SLICED_TELETEXT_NTSC_C |\
-                                         V4L2_SLICED_TELETEXT_NTSC_D)
-
-#define V4L2_SLICED_CAPTION             (V4L2_SLICED_CAPTION_525     |\
-                                         V4L2_SLICED_CAPTION_625)
-
-#define V4L2_SLICED_WSS                 (V4L2_SLICED_WSS_525         |\
-                                         V4L2_SLICED_WSS_625)
-
-#define V4L2_SLICED_VITC                (V4L2_SLICED_VITC_525        |\
-                                         V4L2_SLICED_VITC_625)
-
-#define V4L2_SLICED_VBI_525             (V4L2_SLICED_TELETEXT_NTSC_B |\
-                                         V4L2_SLICED_TELETEXT_NTSC_C |\
-                                         V4L2_SLICED_TELETEXT_NTSC_D |\
-                                         V4L2_SLICED_CAPTION_525     |\
-                                         V4L2_SLICED_WSS_525         |\
-                                         V4l2_SLICED_VITC_525)
-
-#define V4L2_SLICED_VBI_625             (V4L2_SLICED_TELETEXT_PAL_B  |\
-                                         V4L2_SLICED_TELETEXT_PAL_C  |\
-                                         V4L2_SLICED_TELETEXT_SECAM  |\
-                                         V4L2_SLICED_VPS             |\
-                                         V4L2_SLICED_CAPTION_625     |\
-                                         V4L2_SLICED_WSS_625         |\
-                                         V4l2_SLICED_VITC_625)
+#define V4L2_SLICED_WSS_625             (0x4000)
+
+#define V4L2_SLICED_VBI_525             (V4L2_SLICED_CAPTION_525)
+#define V4L2_SLICED_VBI_625             (V4L2_SLICED_TELETEXT_B | V4L2_SLICED_VPS | V4L2_SLICED_WSS_625)
+
 
 struct v4l2_sliced_vbi_cap
 {
diff --git a/include/media/cx25840.h b/include/media/cx25840.h
new file mode 100644
index 000000000000..8e7e52d659a0
--- /dev/null
+++ b/include/media/cx25840.h
@@ -0,0 +1,64 @@
+/*
+    cx25840.h - definition for cx25840/1/2/3 inputs
+
+    Copyright (C) 2006 Hans Verkuil (hverkuil@xs4all.nl)
+
+    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, or
+    (at your option) any later version.
+
+    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., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef _CX25840_H_
+#define _CX25840_H_
+
+enum cx25840_video_input {
+        /* Composite video inputs In1-In8 */
+        CX25840_COMPOSITE1 = 1,
+        CX25840_COMPOSITE2,
+        CX25840_COMPOSITE3,
+        CX25840_COMPOSITE4,
+        CX25840_COMPOSITE5,
+        CX25840_COMPOSITE6,
+        CX25840_COMPOSITE7,
+        CX25840_COMPOSITE8,
+
+        /* S-Video inputs consist of one luma input (In1-In4) ORed with one
+           chroma input (In5-In8) */
+        CX25840_SVIDEO_LUMA1 = 0x10,
+        CX25840_SVIDEO_LUMA2 = 0x20,
+        CX25840_SVIDEO_LUMA3 = 0x30,
+        CX25840_SVIDEO_LUMA4 = 0x40,
+        CX25840_SVIDEO_CHROMA4 = 0x400,
+        CX25840_SVIDEO_CHROMA5 = 0x500,
+        CX25840_SVIDEO_CHROMA6 = 0x600,
+        CX25840_SVIDEO_CHROMA7 = 0x700,
+        CX25840_SVIDEO_CHROMA8 = 0x800,
+
+        /* S-Video aliases for common luma/chroma combinations */
+        CX25840_SVIDEO1 = 0x510,
+        CX25840_SVIDEO2 = 0x620,
+        CX25840_SVIDEO3 = 0x730,
+        CX25840_SVIDEO4 = 0x840,
+};
+
+enum cx25840_audio_input {
+        /* Audio inputs: serial or In4-In8 */
+        CX25840_AUDIO_SERIAL,
+        CX25840_AUDIO4 = 4,
+        CX25840_AUDIO5,
+        CX25840_AUDIO6,
+        CX25840_AUDIO7,
+        CX25840_AUDIO8,
+};
+
+#endif
diff --git a/include/media/msp3400.h b/include/media/msp3400.h
index 0be61a021d45..6ab854931c05 100644
--- a/include/media/msp3400.h
+++ b/include/media/msp3400.h
@@ -80,16 +80,16 @@
  */
 
 /* SCART input to DSP selection */
-#define MSP_IN_SCART_1          0  /* Pin SC1_IN */
-#define MSP_IN_SCART_2          1  /* Pin SC2_IN */
-#define MSP_IN_SCART_3          2  /* Pin SC3_IN */
-#define MSP_IN_SCART_4          3  /* Pin SC4_IN */
+#define MSP_IN_SCART1           0  /* Pin SC1_IN */
+#define MSP_IN_SCART2           1  /* Pin SC2_IN */
+#define MSP_IN_SCART3           2  /* Pin SC3_IN */
+#define MSP_IN_SCART4           3  /* Pin SC4_IN */
 #define MSP_IN_MONO             6  /* Pin MONO_IN */
 #define MSP_IN_MUTE             7  /* Mute DSP input */
 #define MSP_SCART_TO_DSP(in)    (in)
 /* Tuner input to demodulator and DSP selection */
-#define MSP_IN_TUNER_1          0  /* Analog Sound IF input pin ANA_IN1 */
-#define MSP_IN_TUNER_2          1  /* Analog Sound IF input pin ANA_IN2 */
+#define MSP_IN_TUNER1           0  /* Analog Sound IF input pin ANA_IN1 */
+#define MSP_IN_TUNER2           1  /* Analog Sound IF input pin ANA_IN2 */
 #define MSP_TUNER_TO_DSP(in)    ((in) << 3)
 
 /* The msp has up to 5 DSP outputs, each output can independently select
@@ -109,14 +109,14 @@
    DSP. This is currently not implemented. Also not implemented is the
    multi-channel capable I2S3 input of the 44x0G. If someone can demonstrate
    a need for one of those features then additional support can be added. */
-#define MSP_DSP_OUT_TUNER       0  /* Tuner output */
-#define MSP_DSP_OUT_SCART       2  /* SCART output */
-#define MSP_DSP_OUT_I2S1        5  /* I2S1 output */
-#define MSP_DSP_OUT_I2S2        6  /* I2S2 output */
-#define MSP_DSP_OUT_I2S3        7  /* I2S3 output */
-#define MSP_DSP_OUT_MAIN_AVC    11 /* MAIN AVC processed output */
-#define MSP_DSP_OUT_MAIN        12 /* MAIN output */
-#define MSP_DSP_OUT_AUX         13 /* AUX output */
+#define MSP_DSP_IN_TUNER        0  /* Tuner DSP input */
+#define MSP_DSP_IN_SCART        2  /* SCART DSP input */
+#define MSP_DSP_IN_I2S1         5  /* I2S1 DSP input */
+#define MSP_DSP_IN_I2S2         6  /* I2S2 DSP input */
+#define MSP_DSP_IN_I2S3         7  /* I2S3 DSP input */
+#define MSP_DSP_IN_MAIN_AVC     11 /* MAIN AVC processed DSP input */
+#define MSP_DSP_IN_MAIN         12 /* MAIN DSP input */
+#define MSP_DSP_IN_AUX          13 /* AUX DSP input */
 #define MSP_DSP_TO_MAIN(in)     ((in) << 4)
 #define MSP_DSP_TO_AUX(in)      ((in) << 8)
 #define MSP_DSP_TO_SCART1(in)   ((in) << 12)
@@ -125,16 +125,16 @@
 
 /* Output SCART select: the SCART outputs can select which input
    to use. */
-#define MSP_OUT_SCART1          0  /* SCART1 input, bypassing the DSP */
-#define MSP_OUT_SCART2          1  /* SCART2 input, bypassing the DSP */
-#define MSP_OUT_SCART3          2  /* SCART3 input, bypassing the DSP */
-#define MSP_OUT_SCART4          3  /* SCART4 input, bypassing the DSP */
-#define MSP_OUT_SCART1_DA       4  /* DSP SCART1 output */
-#define MSP_OUT_SCART2_DA       5  /* DSP SCART2 output */
-#define MSP_OUT_MONO            6  /* MONO input, bypassing the DSP */
-#define MSP_OUT_MUTE            7  /* MUTE output */
-#define MSP_OUT_TO_SCART1(in)           (in)
-#define MSP_OUT_TO_SCART2(in)           ((in) << 4)
+#define MSP_SC_IN_SCART1        0  /* SCART1 input, bypassing the DSP */
+#define MSP_SC_IN_SCART2        1  /* SCART2 input, bypassing the DSP */
+#define MSP_SC_IN_SCART3        2  /* SCART3 input, bypassing the DSP */
+#define MSP_SC_IN_SCART4        3  /* SCART4 input, bypassing the DSP */
+#define MSP_SC_IN_DSP_SCART1    4  /* DSP SCART1 input */
+#define MSP_SC_IN_DSP_SCART2    5  /* DSP SCART2 input */
+#define MSP_SC_IN_MONO          6  /* MONO input, bypassing the DSP */
+#define MSP_SC_IN_MUTE          7  /* MUTE output */
+#define MSP_SC_TO_SCART1(in)    (in)
+#define MSP_SC_TO_SCART2(in)    ((in) << 4)
 
 /* Shortcut macros */
 #define MSP_INPUT(sc, t, main_aux_src, sc_i2s_src) \
@@ -145,14 +145,14 @@
          MSP_DSP_TO_SCART1(sc_i2s_src) | \
          MSP_DSP_TO_SCART2(sc_i2s_src) | \
          MSP_DSP_TO_I2S(sc_i2s_src))
-#define MSP_INPUT_DEFAULT MSP_INPUT(MSP_IN_SCART_1, MSP_IN_TUNER_1, \
-                                    MSP_DSP_OUT_TUNER, MSP_DSP_OUT_TUNER)
+#define MSP_INPUT_DEFAULT MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER1, \
+                                    MSP_DSP_IN_TUNER, MSP_DSP_IN_TUNER)
 #define MSP_OUTPUT(sc) \
-        (MSP_OUT_TO_SCART1(sc) | \
-         MSP_OUT_TO_SCART2(sc))
+        (MSP_SC_TO_SCART1(sc) | \
+         MSP_SC_TO_SCART2(sc))
 /* This equals the RESET position of the msp3400 ACB register */
-#define MSP_OUTPUT_DEFAULT (MSP_OUT_TO_SCART1(MSP_OUT_SCART3) | \
-                            MSP_OUT_TO_SCART2(MSP_OUT_SCART1_DA))
+#define MSP_OUTPUT_DEFAULT (MSP_SC_TO_SCART1(MSP_SC_IN_SCART3) | \
+                            MSP_SC_TO_SCART2(MSP_SC_IN_DSP_SCART1))
 
 /* Tuner inputs vs. msp version */
 /* Chip      TUNER_1   TUNER_2
diff --git a/include/media/saa7115.h b/include/media/saa7115.h
new file mode 100644
index 000000000000..6b4836f3f057
--- /dev/null
+++ b/include/media/saa7115.h
@@ -0,0 +1,37 @@
+/*
+    saa7115.h - definition for saa7113/4/5 inputs
+
+    Copyright (C) 2006 Hans Verkuil (hverkuil@xs4all.nl)
+
+    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, or
+    (at your option) any later version.
+
+    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., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef _SAA7115_H_
+#define _SAA7115_H_
+
+/* SAA7113/4/5 HW inputs */
+#define SAA7115_COMPOSITE0 0
+#define SAA7115_COMPOSITE1 1
+#define SAA7115_COMPOSITE2 2
+#define SAA7115_COMPOSITE3 3
+#define SAA7115_COMPOSITE4 4 /* not available for the saa7113 */
+#define SAA7115_COMPOSITE5 5 /* not available for the saa7113 */
+#define SAA7115_SVIDEO0    6
+#define SAA7115_SVIDEO1    7
+#define SAA7115_SVIDEO2    8
+#define SAA7115_SVIDEO3    9
+
+#endif
+
diff --git a/include/media/saa7127.h b/include/media/saa7127.h
new file mode 100644
index 000000000000..bbcf862141af
--- /dev/null
+++ b/include/media/saa7127.h
@@ -0,0 +1,41 @@
+/*
+    saa7127.h - definition for saa7126/7/8/9 inputs/outputs
+
+    Copyright (C) 2006 Hans Verkuil (hverkuil@xs4all.nl)
+
+    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, or
+    (at your option) any later version.
+
+    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., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef _SAA7127_H_
+#define _SAA7127_H_
+
+/* Enumeration for the supported input types */
+enum saa7127_input_type {
+        SAA7127_INPUT_TYPE_NORMAL,
+        SAA7127_INPUT_TYPE_TEST_IMAGE
+};
+
+/* Enumeration for the supported output signal types */
+enum saa7127_output_type {
+        SAA7127_OUTPUT_TYPE_BOTH,
+        SAA7127_OUTPUT_TYPE_COMPOSITE,
+        SAA7127_OUTPUT_TYPE_SVIDEO,
+        SAA7127_OUTPUT_TYPE_RGB,
+        SAA7127_OUTPUT_TYPE_YUV_C,
+        SAA7127_OUTPUT_TYPE_YUV_V
+};
+
+#endif
+
diff --git a/include/media/upd64031a.h b/include/media/upd64031a.h
new file mode 100644
index 000000000000..3ad6a32e1bce
--- /dev/null
+++ b/include/media/upd64031a.h
@@ -0,0 +1,40 @@
+/*
+ * upd64031a - NEC Electronics Ghost Reduction input defines
+ *
+ * 2006 by Hans Verkuil (hverkuil@xs4all.nl)
+ *
+ * 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, or (at your option) any later version.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef _UPD64031A_H_
+#define _UPD64031A_H_
+
+/* Ghost reduction modes */
+#define UPD64031A_GR_ON         0
+#define UPD64031A_GR_OFF        1
+#define UPD64031A_GR_THROUGH    3
+
+/* Direct 3D/YCS Connection */
+#define UPD64031A_3DYCS_DISABLE   (0 << 2)
+#define UPD64031A_3DYCS_COMPOSITE (2 << 2)
+#define UPD64031A_3DYCS_SVIDEO    (3 << 2)
+
+/* Composite sync digital separation circuit */
+#define UPD64031A_COMPOSITE_EXTERNAL (1 << 4)
+
+/* Vertical sync digital separation circuit */
+#define UPD64031A_VERTICAL_EXTERNAL (1 << 5)
+
+#endif
diff --git a/include/media/upd64083.h b/include/media/upd64083.h
new file mode 100644
index 000000000000..59b6f32ba300
--- /dev/null
+++ b/include/media/upd64083.h
@@ -0,0 +1,58 @@
+/*
+ * upd6408x - NEC Electronics 3-Dimensional Y/C separation input defines
+ *
+ * 2006 by Hans Verkuil (hverkuil@xs4all.nl)
+ *
+ * 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, or (at your option) any later version.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef _UPD64083_H_
+#define _UPD64083_H_
+
+/* There are two bits of information that the driver needs in order
+   to select the correct routing: the operating mode and the selection
+   of the Y input (external or internal).
+
+   The first two operating modes expect a composite signal on the Y input,
+   the second two operating modes use both the Y and C inputs.
+
+   Normally YCS_MODE is used for tuner and composite inputs, and the
+   YCNR mode is used for S-Video inputs.
+
+   The external Y-ADC is selected when the composite input comes from a
+   upd64031a ghost reduction device. If this device is not present, or
+   the input is a S-Video signal, then the internal Y-ADC input should
+   be used. */
+
+/* Operating modes: */
+
+/* YCS mode: Y/C separation (burst locked clocking) */
+#define UPD64083_YCS_MODE      0
+/* YCS+ mode: 2D Y/C separation and YCNR (burst locked clocking) */
+#define UPD64083_YCS_PLUS_MODE 1
+
+/* Note: the following two modes cannot be used in combination with the
+   external Y-ADC. */
+/* MNNR mode: frame comb type YNR+C delay (line locked clocking) */
+#define UPD64083_MNNR_MODE     2
+/* YCNR mode: frame recursive YCNR (burst locked clocking) */
+#define UPD64083_YCNR_MODE     3
+
+/* Select external Y-ADC: this should be set if this device is used in
+   combination with the upd64031a ghost reduction device.
+   Otherwise leave at 0 (use internal Y-ADC). */
+#define UPD64083_EXT_Y_ADC     (1 << 2)
+
+#endif