V4L/DVB (3411): FE6600 is a Thomson tuner

- The tuner used in DViCO FusionHDTV DVB-T hybrid is made by Thomson
- renamed tuner and dvb_pll structs accordingly

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

3 files changed, 10 insertions, 10 deletions

diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index f655567a8ecd..c0d1f0b12829 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -1073,7 +1073,7 @@ struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID] = {
                 .name           = "DViCO FusionHDTV DVB-T Hybrid",
-                .tuner_type     = TUNER_FE6600,
+                .tuner_type     = TUNER_THOMSON_FE6600,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 2c97d3f7101a..a9fc2695b157 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -599,7 +599,7 @@ static int dvb_register(struct cx8802_dev *dev)
 #ifdef HAVE_ZL10353
         case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID:
                 dev->core->pll_addr = 0x61;
-                dev->core->pll_desc = &dvb_pll_unknown_fe6600;
+                dev->core->pll_desc = &dvb_pll_thomson_fe6600;
                 dev->dvb.frontend = zl10353_attach(&dvico_fusionhdtv_hybrid,
                                                    &dev->core->i2c_adap);
                 break;
diff --git a/drivers/media/video/tuner-types.c b/drivers/media/video/tuner-types.c
index d10cfd400f2b..db8b9873029b 100644
--- a/drivers/media/video/tuner-types.c
+++ b/drivers/media/video/tuner-types.c
@@ -983,19 +983,19 @@ static struct tuner_params tuner_samsung_tcpn_2121p30a_params[] = {
         },
 };
 
-/* ------------ TUNER_FE6600 - DViCO Hybrid PAL ------------ */
+/* ------------ TUNER_THOMSON_FE6600 - DViCO Hybrid PAL ------------ */
 
-static struct tuner_range tuner_fe6600_ranges[] = {
+static struct tuner_range tuner_thomson_fe6600_ranges[] = {
         { 16 * 160.00 /*MHz*/, 0xfe, 0x11, },
         { 16 * 442.00 /*MHz*/, 0xf6, 0x12, },
         { 16 * 999.99        , 0xf6, 0x18, },
 };
 
-static struct tuner_params tuner_fe6600_params[] = {
+static struct tuner_params tuner_thomson_fe6600_params[] = {
         {
                 .type   = TUNER_PARAM_TYPE_PAL,
-                .ranges = tuner_fe6600_ranges,
-                .count  = ARRAY_SIZE(tuner_fe6600_ranges),
+                .ranges = tuner_thomson_fe6600_ranges,
+                .count  = ARRAY_SIZE(tuner_thomson_fe6600_ranges),
         },
 };
 
@@ -1370,9 +1370,9 @@ struct tunertype tuners[] = {
                 .name   = "Xceive xc3028",
                 /* see xc3028.c for details */
         },
-        [TUNER_FE6600] = { /* */
-                .name   = "FE6600",
-                .params = tuner_fe6600_params,
+        [TUNER_THOMSON_FE6600] = { /* Thomson PAL / DVB-T */
+                .name   = "Thomson FE6600",
+                .params = tuner_thomson_fe6600_params,
         },
 };