V4L/DVB (3384): Separate tv & radio freqs, fix cb/freq transmit order for tuners that need this.

- Moved MSP_SET_MATRIX to v4l2-common.h
- Fix typos and integer overflows in tea5767.c
- Split old freq field into a tv_freq and a radio_freq. Prevents
  that a radio tuner is initialized with a tv frequency or vice versa.
- When switching to radio mode initialize the tuner with the last
  used radio frequency (this was already done for the TV mode).
  As a result of these changes the tuner module now remembers the
  last set radio and TV frequencies, which is what you would expect
  to happen.
- Move out of range frequencies to the closest valid frequency as per
  v4l2 API spec.
- Fix incorrect initial radio frequency (multiplier is 16000, not 16)
- Add boundary check for out of range frequencies.
- Use new flag to check if the order of the CB and freq. depends on
  the last set frequency. That is needed for some tuners or you can
  get static as a result. The flag is added for those tuners where I know
  that the datasheet indicates that this is necessary.
- For this new check use the last set div value, not the last frequency
  as radio frequencies are always much higher due to the 16000 multiplier.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

3 files changed, 30 insertions, 3 deletions

diff --git a/include/media/tuner-types.h b/include/media/tuner-types.h
index 756693188991..b37d59d5a103 100644
--- a/include/media/tuner-types.h
+++ b/include/media/tuner-types.h
@@ -20,6 +20,24 @@ struct tuner_range {
 struct tuner_params {
         enum param_type type;
         unsigned int tda988x;
+        /* 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 this flag to 1 if this tuner needs this check.
+         *
+         * 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;
diff --git a/include/media/tuner.h b/include/media/tuner.h
index a1d63787bc08..a5beeac495c7 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -179,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;
 
@@ -197,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)