V4L/DVB (4164): Add DVB-S specific demod names

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

2 files changed, 37 insertions, 16 deletions

diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index 5431caebcd68..d2a7e413e9e1 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -627,7 +627,8 @@ static struct dst_types dst_tlist[] = {
                 .offset = 0,
                 .dst_type =  DST_TYPE_IS_SAT,
                 .type_flags = DST_TYPE_HAS_SYMDIV | DST_TYPE_HAS_FW_1 | DST_TYPE_HAS_OBS_REGS,
-                .dst_feature = 0
+                .dst_feature = 0,
+                .tuner_type = 0
         },      /*      obsolete        */
 
         {
@@ -635,7 +636,8 @@ static struct dst_types dst_tlist[] = {
                 .offset = 0,
                 .dst_type =  DST_TYPE_IS_SAT,
                 .type_flags = DST_TYPE_HAS_SYMDIV | DST_TYPE_HAS_FW_1,
-                .dst_feature = 0
+                .dst_feature = 0,
+                .tuner_type = 0
         },      /*      obsolete        */
 
         {
@@ -643,7 +645,8 @@ static struct dst_types dst_tlist[] = {
                 .offset =  0,
                 .dst_type = DST_TYPE_IS_SAT,
                 .type_flags = DST_TYPE_HAS_TS204 | DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_1,
-                .dst_feature = 0
+                .dst_feature = 0,
+                .tuner_type = 0
         },      /*      obsolete        */
 
         {
@@ -652,7 +655,8 @@ static struct dst_types dst_tlist[] = {
                 .dst_type = DST_TYPE_IS_SAT,
                 .type_flags = DST_TYPE_HAS_SYMDIV | DST_TYPE_HAS_TS204 | DST_TYPE_HAS_FW_2,
                 .dst_feature = DST_TYPE_HAS_DISEQC3 | DST_TYPE_HAS_DISEQC4 | DST_TYPE_HAS_DISEQC5
-                                                         | DST_TYPE_HAS_MAC | DST_TYPE_HAS_MOTO
+                                                         | DST_TYPE_HAS_MAC | DST_TYPE_HAS_MOTO,
+                .tuner_type = TUNER_TYPE_STV0299
          },
 
         {
@@ -660,7 +664,8 @@ static struct dst_types dst_tlist[] = {
                 .offset =  0,
                 .dst_type = DST_TYPE_IS_SAT,
                 .type_flags = DST_TYPE_HAS_SYMDIV | DST_TYPE_HAS_FW_1,
-                .dst_feature = 0
+                .dst_feature = 0,
+                .tuner_type = 0
         },      /*      obsolete        */
 
         {
@@ -668,7 +673,8 @@ static struct dst_types dst_tlist[] = {
                 .offset = 1,
                 .dst_type = DST_TYPE_IS_SAT,
                 .type_flags = DST_TYPE_HAS_TS204 | DST_TYPE_HAS_FW_1,
-                .dst_feature = DST_TYPE_HAS_CA
+                .dst_feature = DST_TYPE_HAS_CA,
+                .tuner_type = 0
         },      /*      An OEM board    */
 
         {
@@ -677,7 +683,8 @@ static struct dst_types dst_tlist[] = {
                 .dst_type = DST_TYPE_IS_SAT,
                 .type_flags = DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_2 | DST_TYPE_HAS_FW_BUILD | DST_TYPE_HAS_INC_COUNT,
                 .dst_feature = DST_TYPE_HAS_CA | DST_TYPE_HAS_DISEQC3 | DST_TYPE_HAS_DISEQC4
-                                                        | DST_TYPE_HAS_MOTO | DST_TYPE_HAS_MAC
+                                                        | DST_TYPE_HAS_MOTO | DST_TYPE_HAS_MAC,
+                .tuner_type = TUNER_TYPE_MULTI
         },
 
         {
@@ -685,7 +692,8 @@ static struct dst_types dst_tlist[] = {
                 .offset = 1,
                 .dst_type = DST_TYPE_IS_SAT,
                 .type_flags = DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_1,
-                .dst_feature = 0
+                .dst_feature = 0,
+                .tuner_type = 0
         },      /* unknown to vendor    */
 
         {
@@ -693,7 +701,8 @@ static struct dst_types dst_tlist[] = {
                 .offset = 1,
                 .dst_type = DST_TYPE_IS_CABLE,
                 .type_flags = DST_TYPE_HAS_MULTI_FE | DST_TYPE_HAS_FW_1 | DST_TYPE_HAS_FW_2,
-                .dst_feature = DST_TYPE_HAS_CA
+                .dst_feature = DST_TYPE_HAS_CA,
+                .tuner_type = 0
         },
 
         {
@@ -701,7 +710,8 @@ static struct dst_types dst_tlist[] = {
                 .offset = 1,
                 .dst_type = DST_TYPE_IS_CABLE,
                 .type_flags = DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_3 | DST_TYPE_HAS_FW_BUILD,
-                .dst_feature = 0
+                .dst_feature = 0,
+                .tuner_type = 0
         },
 
         {
@@ -709,7 +719,8 @@ static struct dst_types dst_tlist[] = {
                 .offset = 1,
                 .dst_type = DST_TYPE_IS_TERR,
                 .type_flags = DST_TYPE_HAS_FW_2 | DST_TYPE_HAS_MULTI_FE,
-                .dst_feature = DST_TYPE_HAS_CA
+                .dst_feature = DST_TYPE_HAS_CA,
+                .tuner_type = 0
         },
 
         {
@@ -717,7 +728,8 @@ static struct dst_types dst_tlist[] = {
                 .offset = 1,
                 .dst_type = DST_TYPE_IS_TERR,
                 .type_flags = DST_TYPE_HAS_FW_2,
-                .dst_feature = 0
+                .dst_feature = 0,
+                .tuner_type = 0
         },
 
         {
@@ -725,7 +737,8 @@ static struct dst_types dst_tlist[] = {
                 .offset = 1,
                 .dst_type = DST_TYPE_IS_TERR,
                 .type_flags = DST_TYPE_HAS_FW_2,
-                .dst_feature = DST_TYPE_HAS_ANALOG
+                .dst_feature = DST_TYPE_HAS_ANALOG,
+                .tuner_type = 0
         },
 
         {
@@ -733,7 +746,8 @@ static struct dst_types dst_tlist[] = {
                 .offset = 1,
                 .dst_type = DST_TYPE_IS_ATSC,
                 .type_flags = DST_TYPE_HAS_FW_2,
-                .dst_feature = 0
+                .dst_feature = 0,
+                .tuner_type = 0
         },
 
         {
@@ -741,7 +755,8 @@ static struct dst_types dst_tlist[] = {
                 .offset = 1,
                 .dst_type = DST_TYPE_IS_ATSC,
                 .type_flags = DST_TYPE_HAS_MULTI_FE | DST_TYPE_HAS_FW_2 | DST_TYPE_HAS_FW_BUILD,
-                .dst_feature = DST_TYPE_HAS_MAC | DST_TYPE_HAS_ANALOG
+                .dst_feature = DST_TYPE_HAS_MAC | DST_TYPE_HAS_ANALOG,
+                .tuner_type = 0
         },
 
         { }
diff --git a/drivers/media/dvb/bt8xx/dst_common.h b/drivers/media/dvb/bt8xx/dst_common.h
index 5bd1bdc4e5f4..3908c5b8c72d 100644
--- a/drivers/media/dvb/bt8xx/dst_common.h
+++ b/drivers/media/dvb/bt8xx/dst_common.h
@@ -64,6 +64,11 @@
 #define DST_TYPE_HAS_ANALOG     64      /*      Analog inputs   */
 #define DST_TYPE_HAS_SESSION    128
 
+#define TUNER_TYPE_MULTI        1
+#define TUNER_TYPE_L64724       2
+#define TUNER_TYPE_STV0299      4
+#define TUNER_TYPE_MB86A15      8
+
 #define RDC_8820_PIO_0_DISABLE  0
 #define RDC_8820_PIO_0_ENABLE   1
 #define RDC_8820_INT            2
@@ -119,7 +124,7 @@ struct dst_state {
         u8 card_info[8];
         u8 vendor[8];
         u8 board_info[8];
-
+        u32 tuner_type;
         struct mutex dst_mutex;
 };
 
@@ -129,6 +134,7 @@ struct dst_types {
         u8 dst_type;
         u32 type_flags;
         u32 dst_feature;
+        u32 tuner_type;
 };
 
 struct dst_config