diff options
author | Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> | 2009-09-30 22:02:21 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-05 15:40:14 -0500 |
commit | 2930992c40ad9c665e2e6e2b8870d3f56428a83d (patch) | |
tree | dfbfab91e4f0072c2cfb78cc1536875a60fedcd5 /drivers | |
parent | ec994d0505fc3dde5f46203602c76b527e2ac69d (diff) |
V4L/DVB (13080): saa7134: add support for the digital side of the Behold X7
Add support for the digital side of the Behold X7
Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com>
Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 1 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-dvb.c | 24 |
2 files changed, 25 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index 09013229d4aa..7de7f1f0adda 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -5239,6 +5239,7 @@ struct saa7134_board saa7134_boards[] = { | |||
5239 | .radio_type = UNSET, | 5239 | .radio_type = UNSET, |
5240 | .tuner_addr = ADDR_UNSET, | 5240 | .tuner_addr = ADDR_UNSET, |
5241 | .radio_addr = ADDR_UNSET, | 5241 | .radio_addr = ADDR_UNSET, |
5242 | .mpeg = SAA7134_MPEG_DVB, | ||
5242 | .inputs = { { | 5243 | .inputs = { { |
5243 | .name = name_tv, | 5244 | .name = name_tv, |
5244 | .vmux = 2, | 5245 | .vmux = 2, |
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c index a26e997a9ce6..204e2bc9fe7a 100644 --- a/drivers/media/video/saa7134/saa7134-dvb.c +++ b/drivers/media/video/saa7134/saa7134-dvb.c | |||
@@ -40,6 +40,7 @@ | |||
40 | #include "tda1004x.h" | 40 | #include "tda1004x.h" |
41 | #include "nxt200x.h" | 41 | #include "nxt200x.h" |
42 | #include "tuner-xc2028.h" | 42 | #include "tuner-xc2028.h" |
43 | #include "xc5000.h" | ||
43 | 44 | ||
44 | #include "tda10086.h" | 45 | #include "tda10086.h" |
45 | #include "tda826x.h" | 46 | #include "tda826x.h" |
@@ -871,6 +872,20 @@ static struct zl10353_config behold_h6_config = { | |||
871 | .disable_i2c_gate_ctrl = 1, | 872 | .disable_i2c_gate_ctrl = 1, |
872 | }; | 873 | }; |
873 | 874 | ||
875 | static struct xc5000_config behold_x7_tunerconfig = { | ||
876 | .i2c_address = 0xc2>>1, | ||
877 | .if_khz = 4560, | ||
878 | .radio_input = 1, | ||
879 | }; | ||
880 | |||
881 | static struct zl10353_config behold_x7_config = { | ||
882 | .demod_address = 0x1e>>1, | ||
883 | .if2 = 45600, | ||
884 | .no_tuner = 1, | ||
885 | .parallel_ts = 1, | ||
886 | .disable_i2c_gate_ctrl = 1, | ||
887 | }; | ||
888 | |||
874 | /* ================================================================== | 889 | /* ================================================================== |
875 | * tda10086 based DVB-S cards, helper functions | 890 | * tda10086 based DVB-S cards, helper functions |
876 | */ | 891 | */ |
@@ -1482,6 +1497,15 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1482 | TUNER_PHILIPS_FMD1216MEX_MK3); | 1497 | TUNER_PHILIPS_FMD1216MEX_MK3); |
1483 | } | 1498 | } |
1484 | break; | 1499 | break; |
1500 | case SAA7134_BOARD_BEHOLD_X7: | ||
1501 | fe0->dvb.frontend = dvb_attach(zl10353_attach, | ||
1502 | &behold_x7_config, | ||
1503 | &dev->i2c_adap); | ||
1504 | if (fe0->dvb.frontend) { | ||
1505 | dvb_attach(xc5000_attach, fe0->dvb.frontend, | ||
1506 | &dev->i2c_adap, &behold_x7_tunerconfig); | ||
1507 | } | ||
1508 | break; | ||
1485 | case SAA7134_BOARD_AVERMEDIA_A700_PRO: | 1509 | case SAA7134_BOARD_AVERMEDIA_A700_PRO: |
1486 | case SAA7134_BOARD_AVERMEDIA_A700_HYBRID: | 1510 | case SAA7134_BOARD_AVERMEDIA_A700_HYBRID: |
1487 | /* Zarlink ZL10313 */ | 1511 | /* Zarlink ZL10313 */ |