aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-dvb.c
diff options
context:
space:
mode:
authorHartmut Hackmann <hartmut.hackmann@t-online.de>2008-02-09 21:54:24 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-02-18 09:15:18 -0500
commitea75baf4b0f117564bd50827a49c4b14d61d24e9 (patch)
treec7618a6ea479a00747f48b3ea926a3ab8a7865f8 /drivers/media/video/saa7134/saa7134-dvb.c
parent83947d307d63dc0c30ab0809714f0bcbbdf8c3e2 (diff)
V4L/DVB (7186): tda10086: make the 22kHz tone for DISEQC a config option
Some cards need the diseqc signal modulated, while some just need the envelope to control the LNB supply. This fixes Bug 9887 Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de> Acked-by: Oliver Endriss <o.endriss@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-dvb.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-dvb.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index e58f437ea9f7..ea2be9eceeb8 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -841,6 +841,7 @@ static struct tda1004x_config ads_tech_duo_config = {
841static struct tda10086_config flydvbs = { 841static struct tda10086_config flydvbs = {
842 .demod_address = 0x0e, 842 .demod_address = 0x0e,
843 .invert = 0, 843 .invert = 0,
844 .diseqc_tone = 0,
844}; 845};
845 846
846/* ================================================================== 847/* ==================================================================
@@ -955,9 +956,9 @@ static int dvb_init(struct saa7134_dev *dev)
955 configure_tda827x_fe(dev, &tda827x_lifeview_config); 956 configure_tda827x_fe(dev, &tda827x_lifeview_config);
956 break; 957 break;
957 case SAA7134_BOARD_FLYDVB_TRIO: 958 case SAA7134_BOARD_FLYDVB_TRIO:
958 if(! use_frontend) { //terrestrial 959 if(! use_frontend) { /* terrestrial */
959 configure_tda827x_fe(dev, &lifeview_trio_config); 960 configure_tda827x_fe(dev, &lifeview_trio_config);
960 } else { //satellite 961 } else { /* satellite */
961 dev->dvb.frontend = dvb_attach(tda10086_attach, &flydvbs, &dev->i2c_adap); 962 dev->dvb.frontend = dvb_attach(tda10086_attach, &flydvbs, &dev->i2c_adap);
962 if (dev->dvb.frontend) { 963 if (dev->dvb.frontend) {
963 if (dvb_attach(tda826x_attach, dev->dvb.frontend, 0x63, 964 if (dvb_attach(tda826x_attach, dev->dvb.frontend, 0x63,