Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

4 files changed, 73 insertions, 3 deletions

diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index 6ff2d365895f..474c8f4f5d4f 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -104,6 +104,10 @@
 #define I2C_DRIVERID_AKITAIOEXP 74      /* IO Expander on Sharp SL-C1000 */
 #define I2C_DRIVERID_INFRARED   75      /* I2C InfraRed on Video boards */
 #define I2C_DRIVERID_TVP5150    76      /* TVP5150 video decoder        */
+#define I2C_DRIVERID_WM8739     77      /* wm8739 audio processor       */
+#define I2C_DRIVERID_UPD64083   78      /* upd64083 video processor     */
+#define I2C_DRIVERID_UPD64031A  79      /* upd64031a video processor    */
+#define I2C_DRIVERID_SAA717X    80      /* saa717x video encoder        */
 
 #define I2C_DRIVERID_I2CDEV     900
 #define I2C_DRIVERID_ARP        902    /* SMBus ARP Client              */
diff --git a/include/media/tuner-types.h b/include/media/tuner-types.h
new file mode 100644
index 000000000000..15821ab14a9e
--- /dev/null
+++ b/include/media/tuner-types.h
@@ -0,0 +1,55 @@
+/*
+ * descriptions for simple tuners.
+ */
+
+#ifndef __TUNER_TYPES_H__
+#define __TUNER_TYPES_H__
+
+enum param_type {
+        TUNER_PARAM_TYPE_RADIO, \
+        TUNER_PARAM_TYPE_PAL, \
+        TUNER_PARAM_TYPE_SECAM, \
+        TUNER_PARAM_TYPE_NTSC
+};
+
+struct tuner_range {
+        unsigned short limit;
+        unsigned char cb;
+};
+
+struct tuner_params {
+        enum param_type type;
+        /* Many Philips based tuners have a comment like this in their
+         * datasheet:
+         *
+         *   For channel selection involving band switching, and to ensure
+         *   smooth tuning to the desired channel without causing
+         *   unnecessary charge pump action, it is recommended to consider
+         *   the difference between wanted channel frequency and the
+         *   current channel frequency.  Unnecessary charge pump action
+         *   will result in very low tuning voltage which may drive the
+         *   oscillator to extreme conditions.
+         *
+         * Set cb_first_if_lower_freq to 1, if this check is
+         * required for this tuner.
+         *
+         * I tested this for PAL by first setting the TV frequency to
+         * 203 MHz and then switching to 96.6 MHz FM radio. The result was
+         * static unless the control byte was sent first.
+         */
+        unsigned int cb_first_if_lower_freq:1;
+        unsigned char config; /* to be moved into struct tuner_range for dvb-pll merge */
+
+        unsigned int count;
+        struct tuner_range *ranges;
+};
+
+struct tunertype {
+        char *name;
+        struct tuner_params *params;
+};
+
+extern struct tunertype tuners[];
+extern unsigned const int tuner_count;
+
+#endif
diff --git a/include/media/tuner.h b/include/media/tuner.h
index 27cbf08c931d..a5beeac495c7 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -23,6 +23,7 @@
 #define _TUNER_H
 
 #include <linux/videodev2.h>
+#include <media/tuner-types.h>
 
 #define ADDR_UNSET (255)
 
@@ -114,6 +115,7 @@
 
 #define TUNER_PHILIPS_TUV1236D          68      /* ATI HDTV Wonder */
 #define TUNER_TNF_5335MF                69      /* Sabrent Bt848   */
+#define TUNER_SAMSUNG_TCPN_2121P30A     70      /* Hauppauge PVR-500MCE NTSC */
 
 /* tv card specific */
 #define TDA9887_PRESENT                 (1<<0)
@@ -177,7 +179,9 @@ struct tuner {
         unsigned int mode;
         unsigned int mode_mask; /* Combination of allowable modes */
 
-        unsigned int freq;      /* keep track of the current settings */
+        unsigned int tv_freq;   /* keep track of the current settings */
+        unsigned int radio_freq;
+        u16          last_div;
         unsigned int audmode;
         v4l2_std_id  std;
 
@@ -195,8 +199,8 @@ struct tuner {
         unsigned int sgIF;
 
         /* function ptrs */
-        void (*tv_freq)(struct i2c_client *c, unsigned int freq);
-        void (*radio_freq)(struct i2c_client *c, unsigned int freq);
+        void (*set_tv_freq)(struct i2c_client *c, unsigned int freq);
+        void (*set_radio_freq)(struct i2c_client *c, unsigned int freq);
         int  (*has_signal)(struct i2c_client *c);
         int  (*is_stereo)(struct i2c_client *c);
         void (*standby)(struct i2c_client *c);
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index c74052abb189..d4030a7e16e0 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -120,6 +120,13 @@ enum v4l2_chip_ident {
 /* select from TV,radio,extern,MUTE */
 #define AUDC_SET_INPUT        _IOW('d',89,int)
 
+/* msp3400 ioctl: will be removed in the near future */
+struct msp_matrix {
+  int input;
+  int output;
+};
+#define MSP_SET_MATRIX     _IOW('m',17,struct msp_matrix)
+
 /* tuner ioctls */
 /* Sets tuner type and its I2C addr */
 #define TUNER_SET_TYPE_ADDR          _IOW('d',90,int)