V4L/DVB (4169): Add more Firmware and Tuner names

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

diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index abed03a5a156e7fbeeaee36f0e8c1fe7d22b77dc..55a00cf04572790f9dc94e326439c66d138cb1e4 100644 (file)
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -590,28 +590,116 @@ static int dst_type_print(u8 type)
 
 struct tuner_types tuner_list[] = {
        {
-               .tuner_type = 2,
+               .tuner_type = TUNER_TYPE_L64724,
                .tuner_name = "L 64724",
-               .board_name = " "
+               .board_name = "UNKNOWN",
+               .fw_name    = "UNKNOWN"
        },
 
        {
-               .tuner_type = 4,
+               .tuner_type = TUNER_TYPE_STV0299,
                .tuner_name = "STV 0299",
-               .board_name = "VP1030"
+               .board_name = "VP1020",
+               .fw_name    = "DST-MOT"
        },
 
        {
-               .tuner_type = 8,
+               .tuner_type = TUNER_TYPE_STV0299,
+               .tuner_name = "STV 0299",
+               .board_name = "VP1020",
+               .fw_name    = "DST-03T"
+       },
+
+       {
+               .tuner_type = TUNER_TYPE_MB86A15,
                .tuner_name = "MB 86A15",
-               .board_name = "VP1025"
+               .board_name = "VP1022",
+               .fw_name    = "DST-03T"
        },
 
        {
-               .tuner_type = 16,
-               .tuner_name = "NXT 200x",
-               .board_name = "VP3250"
-       }
+               .tuner_type = TUNER_TYPE_MB86A15,
+               .tuner_name = "MB 86A15",
+               .board_name = "VP1025",
+               .fw_name    = "DST-03T"
+       },
+
+       {
+               .tuner_type = TUNER_TYPE_STV0299,
+               .tuner_name = "STV 0299",
+               .board_name = "VP1030",
+               .fw_name    = "DST-CI"
+       },
+
+       {
+               .tuner_type = TUNER_TYPE_STV0299,
+               .tuner_name = "STV 0299",
+               .board_name = "VP1030",
+               .fw_name    = "DSTMCI"
+       },
+
+       {
+               .tuner_type = TUNER_TYPE_UNKNOWN,
+               .tuner_name = "UNKNOWN",
+               .board_name = "VP2030",
+               .fw_name    = "DCT-CI"
+       },
+
+       {
+               .tuner_type = TUNER_TYPE_UNKNOWN,
+               .tuner_name = "UNKNOWN",
+               .board_name = "VP2031",
+               .fw_name    = "DCT-CI"
+       },
+
+       {
+               .tuner_type = TUNER_TYPE_UNKNOWN,
+               .tuner_name = "UNKNOWN",
+               .board_name = "VP2040",
+               .fw_name    = "DCT-CI"
+       },
+
+       {
+               .tuner_type = TUNER_TYPE_UNKNOWN,
+               .tuner_name = "UNKNOWN",
+               .board_name = "VP3020",
+               .fw_name    = "DTTFTA"
+       },
+
+       {
+               .tuner_type = TUNER_TYPE_UNKNOWN,
+               .tuner_name = "UNKNOWN",
+               .board_name = "VP3021",
+               .fw_name    = "DTTFTA"
+       },
+
+       {
+               .tuner_type = TUNER_TYPE_TDA10046,
+               .tuner_name = "TDA10046",
+               .board_name = "VP3040",
+               .fw_name    = "DTT-CI"
+       },
+
+       {
+               .tuner_type = TUNER_TYPE_UNKNOWN,
+               .tuner_name = "UNKNOWN",
+               .board_name = "VP3051",
+               .fw_name    = "DTTNXT"
+       },
+
+       {
+               .tuner_type = TUNER_TYPE_NXT200x,
+               .tuner_name = "NXT200x",
+               .board_name = "VP3220",
+               .fw_name    = "ATSCDI"
+       },
+
+       {
+               .tuner_type = TUNER_TYPE_NXT200x,
+               .tuner_name = "NXT200x",
+               .board_name = "VP3250",
+               .fw_name    = "ATSCAD"
+       },
 };
 
 /*

diff --git a/drivers/media/dvb/bt8xx/dst_common.h b/drivers/media/dvb/bt8xx/dst_common.h
index 57518e578c4c41495ea72b621be346c91c87d56a..d384ab443e3b628bb0f0a61b4287116b4e10c449 100644 (file)
--- a/drivers/media/dvb/bt8xx/dst_common.h
+++ b/drivers/media/dvb/bt8xx/dst_common.h
@@ -66,14 +66,17 @@
 #define DST_TYPE_HAS_SESSION   128
 
 #define TUNER_TYPE_MULTI       1
-
+#define TUNER_TYPE_UNKNOWN     2
 /*     DVB-S           */
-#define TUNER_TYPE_L64724      2
-#define TUNER_TYPE_STV0299     4
-#define TUNER_TYPE_MB86A15     8
+#define TUNER_TYPE_L64724      4
+#define TUNER_TYPE_STV0299     8
+#define TUNER_TYPE_MB86A15     16
+
+/*     DVB-T           */
+#define TUNER_TYPE_TDA10046    32
 
 /*     ATSC            */
-#define TUNER_TYPE_NXT200x     16
+#define TUNER_TYPE_NXT200x     64
 
 
 #define RDC_8820_PIO_0_DISABLE 0
@@ -140,6 +143,7 @@ struct tuner_types {
        u32 tuner_type;
        char *tuner_name;
        char *board_name;
+       char *fw_name;
 };
 
 struct dst_types {