Merge remote-tracking branch 'lsk/v3.10/topic/mailbox' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / include / media / tuner-types.h

diff --git a/include/media/tuner-types.h b/include/media/tuner-types.h
index b201371416a0c793473b1fdd96dc9885f06746d5..ab03c5344209937818de9200a9f33b678e64c2c5 100644 (file)
--- a/include/media/tuner-types.h
+++ b/include/media/tuner-types.h
@@ -6,10 +6,11 @@
 #define __TUNER_TYPES_H__
 
 enum param_type {
-       TUNER_PARAM_TYPE_RADIO, \
-       TUNER_PARAM_TYPE_PAL, \
-       TUNER_PARAM_TYPE_SECAM, \
-       TUNER_PARAM_TYPE_NTSC
+       TUNER_PARAM_TYPE_RADIO,
+       TUNER_PARAM_TYPE_PAL,
+       TUNER_PARAM_TYPE_SECAM,
+       TUNER_PARAM_TYPE_NTSC,
+       TUNER_PARAM_TYPE_DIGITAL,
 };
 
 struct tuner_range {
@@ -105,6 +106,7 @@ struct tuner_params {
           the SECAM-L/L' standards. Range: -16:+15 */
        signed int default_top_secam_high:5;
 
+       u16 iffreq;
 
        unsigned int count;
        struct tuner_range *ranges;
@@ -114,6 +116,13 @@ struct tunertype {
        char *name;
        unsigned int count;
        struct tuner_params *params;
+
+       u16 min;
+       u16 max;
+       u32 stepsize;
+
+       u8 *initdata;
+       u8 *sleepdata;
 };
 
 extern struct tunertype tuners[];