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>

1 files changed, 71 insertions, 0 deletions

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 418ea8b7f85..2d72de0e756 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -156,6 +156,74 @@ struct em28xx_board em28xx_boards[] = {
                                         MSP_DSP_IN_SCART, MSP_DSP_IN_SCART),
                 }},
         },
+        [EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900] = {
+                .name         = "Hauppauge WinTV HVR 900",
+                .vchannels    = 3,
+                .norm         = VIDEO_MODE_PAL,
+                .tda9887_conf = TDA9887_PRESENT,
+                .tuner_type   = TUNER_XC2028,
+                .has_tuner    = 1,
+                .decoder      = EM28XX_TVP5150,
+                .input          = {{
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = TVP5150_COMPOSITE1,
+                        .amux     = 1,
+                },{
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = TVP5150_COMPOSITE0,
+                        .amux     = 0,
+                },{
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = TVP5150_SVIDEO,
+                        .amux     = 1,
+                }},
+        },
+        [EM2880_BOARD_TERRATEC_HYBRID_XS] = {
+                .name         = "Terratec Hybrid XS",
+                .vchannels    = 3,
+                .norm         = VIDEO_MODE_PAL,
+                .tda9887_conf = TDA9887_PRESENT,
+                .has_tuner    = 1,
+                .tuner_type   = TUNER_XC2028,
+                .decoder      = EM28XX_TVP5150,
+                .input          = {{
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = TVP5150_COMPOSITE0,
+                        .amux     = 0,
+                },{
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = TVP5150_COMPOSITE1,
+                        .amux     = 1,
+                },{
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = TVP5150_SVIDEO,
+                        .amux     = 1,
+                }},
+        },
+        /* maybe there's a reason behind it why Terratec sells the Hybrid XS as Prodigy XS with a
+         * different PID, let's keep it separated for now maybe we'll need it lateron */
+        [EM2880_BOARD_TERRATEC_PRODIGY_XS] = {
+                .name         = "Terratec Prodigy XS",
+                .vchannels    = 3,
+                .norm         = VIDEO_MODE_PAL,
+                .tda9887_conf = TDA9887_PRESENT,
+                .has_tuner    = 1,
+                .tuner_type   = TUNER_XC2028,
+                .decoder      = EM28XX_TVP5150,
+                .input          = {{
+                        .type     = EM28XX_VMUX_TELEVISION,
+                        .vmux     = TVP5150_COMPOSITE0,
+                        .amux     = 0,
+                },{
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = TVP5150_COMPOSITE1,
+                        .amux     = 1,
+                },{
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = TVP5150_SVIDEO,
+                        .amux     = 1,
+                }},
+        },
         [EM2820_BOARD_MSI_VOX_USB_2] = {
                 .name           = "MSI VOX USB 2.0",
                 .vchannels      = 3,
@@ -274,6 +342,9 @@ struct usb_device_id em28xx_id_table [] = {
         { USB_DEVICE(0x2304, 0x0208), .driver_info = EM2820_BOARD_PINNACLE_USB_2 },
         { USB_DEVICE(0x2040, 0x4200), .driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 },
         { USB_DEVICE(0x2304, 0x0207), .driver_info = EM2820_BOARD_PINNACLE_DVC_90 },
+        { USB_DEVICE(0x2040, 0x6500), .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 },
+        { USB_DEVICE(0x0ccd, 0x0042), .driver_info = EM2880_BOARD_TERRATEC_HYBRID_XS },
+        { USB_DEVICE(0x0ccd, 0x0047), .driver_info = EM2880_BOARD_TERRATEC_PRODIGY_XS },
         { },
 };