aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/cx88')
-rw-r--r--drivers/media/video/cx88/cx88-dvb.c47
1 files changed, 35 insertions, 12 deletions
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index f634041ac985..d599ecfed08b 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -520,7 +520,9 @@ static int dvb_register(struct cx8802_dev *dev)
520 dev->dvb.frontend = cx22702_attach(&hauppauge_novat_config, 520 dev->dvb.frontend = cx22702_attach(&hauppauge_novat_config,
521 &dev->core->i2c_adap); 521 &dev->core->i2c_adap);
522 if (dev->dvb.frontend != NULL) { 522 if (dev->dvb.frontend != NULL) {
523 dvb_pll_attach(dev->dvb.frontend, 0x61, &dev->core->i2c_adap, &dvb_pll_thomson_dtt759x); 523 dvb_pll_attach(dev->dvb.frontend, 0x61,
524 &dev->core->i2c_adap,
525 &dvb_pll_thomson_dtt759x);
524 } 526 }
525 break; 527 break;
526 case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1: 528 case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1:
@@ -530,7 +532,9 @@ static int dvb_register(struct cx8802_dev *dev)
530 dev->dvb.frontend = cx22702_attach(&connexant_refboard_config, 532 dev->dvb.frontend = cx22702_attach(&connexant_refboard_config,
531 &dev->core->i2c_adap); 533 &dev->core->i2c_adap);
532 if (dev->dvb.frontend != NULL) { 534 if (dev->dvb.frontend != NULL) {
533 dvb_pll_attach(dev->dvb.frontend, 0x60, &dev->core->i2c_adap, &dvb_pll_thomson_dtt7579); 535 dvb_pll_attach(dev->dvb.frontend, 0x60,
536 &dev->core->i2c_adap,
537 &dvb_pll_thomson_dtt7579);
534 } 538 }
535 break; 539 break;
536 case CX88_BOARD_WINFAST_DTV2000H: 540 case CX88_BOARD_WINFAST_DTV2000H:
@@ -539,7 +543,9 @@ static int dvb_register(struct cx8802_dev *dev)
539 dev->dvb.frontend = cx22702_attach(&hauppauge_hvr1100_config, 543 dev->dvb.frontend = cx22702_attach(&hauppauge_hvr1100_config,
540 &dev->core->i2c_adap); 544 &dev->core->i2c_adap);
541 if (dev->dvb.frontend != NULL) { 545 if (dev->dvb.frontend != NULL) {
542 dvb_pll_attach(dev->dvb.frontend, 0x61, &dev->core->i2c_adap, &dvb_pll_fmd1216me); 546 dvb_pll_attach(dev->dvb.frontend, 0x61,
547 &dev->core->i2c_adap,
548 &dvb_pll_fmd1216me);
543 } 549 }
544 break; 550 break;
545#endif 551#endif
@@ -549,7 +555,9 @@ static int dvb_register(struct cx8802_dev *dev)
549 dev->dvb.frontend = mt352_attach(&dvico_fusionhdtv, 555 dev->dvb.frontend = mt352_attach(&dvico_fusionhdtv,
550 &dev->core->i2c_adap); 556 &dev->core->i2c_adap);
551 if (dev->dvb.frontend != NULL) { 557 if (dev->dvb.frontend != NULL) {
552 dvb_pll_attach(dev->dvb.frontend, 0x60, &dev->core->i2c_adap, &dvb_pll_thomson_dtt7579); 558 dvb_pll_attach(dev->dvb.frontend, 0x60,
559 &dev->core->i2c_adap,
560 &dvb_pll_thomson_dtt7579);
553 break; 561 break;
554 } 562 }
555#endif 563#endif
@@ -558,7 +566,9 @@ static int dvb_register(struct cx8802_dev *dev)
558 dev->dvb.frontend = zl10353_attach(&dvico_fusionhdtv_plus_v1_1, 566 dev->dvb.frontend = zl10353_attach(&dvico_fusionhdtv_plus_v1_1,
559 &dev->core->i2c_adap); 567 &dev->core->i2c_adap);
560 if (dev->dvb.frontend != NULL) { 568 if (dev->dvb.frontend != NULL) {
561 dvb_pll_attach(dev->dvb.frontend, 0x60, &dev->core->i2c_adap, &dvb_pll_thomson_dtt7579); 569 dvb_pll_attach(dev->dvb.frontend, 0x60,
570 &dev->core->i2c_adap,
571 &dvb_pll_thomson_dtt7579);
562 } 572 }
563#endif 573#endif
564 break; 574 break;
@@ -569,7 +579,9 @@ static int dvb_register(struct cx8802_dev *dev)
569 dev->dvb.frontend = mt352_attach(&dvico_fusionhdtv_dual, 579 dev->dvb.frontend = mt352_attach(&dvico_fusionhdtv_dual,
570 &dev->core->i2c_adap); 580 &dev->core->i2c_adap);
571 if (dev->dvb.frontend != NULL) { 581 if (dev->dvb.frontend != NULL) {
572 dvb_pll_attach(dev->dvb.frontend, 0x61, &dev->core->i2c_adap, &dvb_pll_thomson_dtt7579); 582 dvb_pll_attach(dev->dvb.frontend, 0x61,
583 &dev->core->i2c_adap,
584 &dvb_pll_thomson_dtt7579);
573 break; 585 break;
574 } 586 }
575#endif 587#endif
@@ -578,7 +590,9 @@ static int dvb_register(struct cx8802_dev *dev)
578 dev->dvb.frontend = zl10353_attach(&dvico_fusionhdtv_plus_v1_1, 590 dev->dvb.frontend = zl10353_attach(&dvico_fusionhdtv_plus_v1_1,
579 &dev->core->i2c_adap); 591 &dev->core->i2c_adap);
580 if (dev->dvb.frontend != NULL) { 592 if (dev->dvb.frontend != NULL) {
581 dvb_pll_attach(dev->dvb.frontend, 0x61, &dev->core->i2c_adap, &dvb_pll_thomson_dtt7579); 593 dvb_pll_attach(dev->dvb.frontend, 0x61,
594 &dev->core->i2c_adap,
595 &dvb_pll_thomson_dtt7579);
582 } 596 }
583#endif 597#endif
584 break; 598 break;
@@ -588,7 +602,9 @@ static int dvb_register(struct cx8802_dev *dev)
588 dev->dvb.frontend = mt352_attach(&dvico_fusionhdtv, 602 dev->dvb.frontend = mt352_attach(&dvico_fusionhdtv,
589 &dev->core->i2c_adap); 603 &dev->core->i2c_adap);
590 if (dev->dvb.frontend != NULL) { 604 if (dev->dvb.frontend != NULL) {
591 dvb_pll_attach(dev->dvb.frontend, 0x61, &dev->core->i2c_adap, &dvb_pll_lg_z201); 605 dvb_pll_attach(dev->dvb.frontend, 0x61,
606 &dev->core->i2c_adap,
607 &dvb_pll_lg_z201);
592 } 608 }
593 break; 609 break;
594 case CX88_BOARD_KWORLD_DVB_T: 610 case CX88_BOARD_KWORLD_DVB_T:
@@ -597,7 +613,9 @@ static int dvb_register(struct cx8802_dev *dev)
597 dev->dvb.frontend = mt352_attach(&dntv_live_dvbt_config, 613 dev->dvb.frontend = mt352_attach(&dntv_live_dvbt_config,
598 &dev->core->i2c_adap); 614 &dev->core->i2c_adap);
599 if (dev->dvb.frontend != NULL) { 615 if (dev->dvb.frontend != NULL) {
600 dvb_pll_attach(dev->dvb.frontend, 0x61, &dev->core->i2c_adap, &dvb_pll_unknown_1); 616 dvb_pll_attach(dev->dvb.frontend, 0x61,
617 &dev->core->i2c_adap,
618 &dvb_pll_unknown_1);
601 } 619 }
602 break; 620 break;
603 case CX88_BOARD_DNTV_LIVE_DVB_T_PRO: 621 case CX88_BOARD_DNTV_LIVE_DVB_T_PRO:
@@ -630,7 +648,9 @@ static int dvb_register(struct cx8802_dev *dev)
630 dev->dvb.frontend = or51132_attach(&pchdtv_hd3000, 648 dev->dvb.frontend = or51132_attach(&pchdtv_hd3000,
631 &dev->core->i2c_adap); 649 &dev->core->i2c_adap);
632 if (dev->dvb.frontend != NULL) { 650 if (dev->dvb.frontend != NULL) {
633 dvb_pll_attach(dev->dvb.frontend, 0x61, &dev->core->i2c_adap, &dvb_pll_thomson_dtt761x); 651 dvb_pll_attach(dev->dvb.frontend, 0x61,
652 &dev->core->i2c_adap,
653 &dvb_pll_thomson_dtt761x);
634 } 654 }
635 break; 655 break;
636#endif 656#endif
@@ -716,7 +736,9 @@ static int dvb_register(struct cx8802_dev *dev)
716 dev->dvb.frontend = nxt200x_attach(&ati_hdtvwonder, 736 dev->dvb.frontend = nxt200x_attach(&ati_hdtvwonder,
717 &dev->core->i2c_adap); 737 &dev->core->i2c_adap);
718 if (dev->dvb.frontend != NULL) { 738 if (dev->dvb.frontend != NULL) {
719 dvb_pll_attach(dev->dvb.frontend, 0x61, &dev->core->i2c_adap, &dvb_pll_tuv1236d); 739 dvb_pll_attach(dev->dvb.frontend, 0x61,
740 &dev->core->i2c_adap,
741 &dvb_pll_tuv1236d);
720 } 742 }
721 break; 743 break;
722#endif 744#endif
@@ -726,7 +748,8 @@ static int dvb_register(struct cx8802_dev *dev)
726 dev->dvb.frontend = cx24123_attach(&hauppauge_novas_config, 748 dev->dvb.frontend = cx24123_attach(&hauppauge_novas_config,
727 &dev->core->i2c_adap); 749 &dev->core->i2c_adap);
728 if (dev->dvb.frontend) { 750 if (dev->dvb.frontend) {
729 isl6421_attach(dev->dvb.frontend, &dev->core->i2c_adap, 0x08, 0x00, 0x00); 751 isl6421_attach(dev->dvb.frontend, &dev->core->i2c_adap,
752 0x08, 0x00, 0x00);
730 } 753 }
731 break; 754 break;
732 case CX88_BOARD_KWORLD_DVBS_100: 755 case CX88_BOARD_KWORLD_DVBS_100: