V4L/DVB (9135): cx88 Dvico FusionHDTV Pro

Well, one thing you encouraged me to do was re-test some of my cards
which contained the xc3028-zarlink combo.

Which led me to test a Dvico FusionHDTV Pro.

Almost a year ago, Chris Pascoe did a patch for this which can be found
at his ~pascoe/xc-test at Linuxtv.
This worked very well, however that was using his version of firmware.

Alas, someone attempted to use this and patch v4l-dvb, and messed it up.
So I've fixed it.
I enclose the patch against today's tree (containing your latest
tuner-xc2028.c patch).

The card now works very well, well with DVB-T anyway.

Signed-off-by: Tim Farrington <timf@iinet.net.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 369ba69..a9e52de 100644 (file)
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -1581,9 +1581,9 @@ static const struct cx88_board cx88_boards[] = {
        },
        [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PRO] = {
                .name           = "DViCO FusionHDTV DVB-T PRO",
-               .tuner_type     = TUNER_ABSENT, /* XXX: Has XC3028 */
+               .tuner_type     = TUNER_XC2028,
+               .tuner_addr     = 0x61,
                .radio_type     = UNSET,
-               .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
                .input          = { {
                        .type   = CX88_VMUX_COMPOSITE1,
@@ -2671,7 +2671,7 @@ void cx88_setup_xc3028(struct cx88_core *core, struct xc2028_ctrl *ctl)
                        core->i2c_algo.udelay = 16;
                break;
        case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PRO:
-               ctl->scode_table = XC3028_FE_ZARLINK456;
+               ctl->demod = XC3028_FE_ZARLINK456;
                break;
        case CX88_BOARD_KWORLD_ATSC_120:
        case CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO: