V4L/DVB (6422): Add the pending entries for xc2028/3028 based boards

Also replaces all occurrences of TUNER_XCEIVE_XC3028 to TUNER_XC2028.

Some work is still may be required to make sure that non-tm6000 drivers will
be capable of using tuner-xc2028.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/media/video/ivtv/ivtv-cards.c b/drivers/media/video/ivtv/ivtv-cards.c
index b6a8be622d3c..aaa114b5c268 100644
--- a/drivers/media/video/ivtv/ivtv-cards.c
+++ b/drivers/media/video/ivtv/ivtv-cards.c
@@ -848,7 +848,7 @@ static const struct ivtv_card ivtv_card_pg600v2 = {
                 { IVTV_CARD_INPUT_LINE_IN1,   CX25840_AUDIO_SERIAL },
         },
         .tuners = {
-                { .std = V4L2_STD_ALL, .tuner = TUNER_XCEIVE_XC3028 },
+                { .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 },
         },
         .pci_list = ivtv_pci_pg600v2,
 };
@@ -879,7 +879,7 @@ static const struct ivtv_card ivtv_card_club3d = {
                 { IVTV_CARD_INPUT_LINE_IN1,   CX25840_AUDIO_SERIAL },
         },
         .tuners = {
-                { .std = V4L2_STD_ALL, .tuner = TUNER_XCEIVE_XC3028 },
+                { .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 },
         },
         .pci_list = ivtv_pci_club3d,
 };
@@ -910,7 +910,7 @@ static const struct ivtv_card ivtv_card_avertv_mce116 = {
         },
         .gpio_init = { .direction = 0xe000, .initial_value = 0x4000 }, /* enable line-in */
         .tuners = {
-                { .std = V4L2_STD_ALL, .tuner = TUNER_XCEIVE_XC3028 },
+                { .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 },
         },
         .pci_list = ivtv_pci_avertv_mce116,
 };
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 6d2dd8764f81..ec40453e46e4 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -829,7 +829,7 @@ static void ivtv_load_and_init_modules(struct ivtv *itv)
         /* load modules */
 #ifndef CONFIG_VIDEO_TUNER
         if (hw & IVTV_HW_TUNER) {
-                if (itv->options.tuner == TUNER_XCEIVE_XC3028) {
+                if (itv->options.tuner == TUNER_XC2028) {
                         IVTV_INFO("Xceive tuner not yet supported, only composite and S-Video inputs will be available\n");
                         itv->tunerid = 1;
                 }