aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx23885/cx23885-dvb.c
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@kernellabs.com>2009-05-08 15:05:29 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-06-16 17:21:03 -0400
commit19bc57968cc854c7da4846c21b3ef2a39e43f97d (patch)
treec243fa4b7536f5c6eba0c120a6203afeba0f2958 /drivers/media/video/cx23885/cx23885-dvb.c
parentd099becb0bd7ee01a13d58371b4ea5a2f7052c04 (diff)
V4L/DVB (11770): cx23885: add ATSC/QAM tuning support for Hauppauge WinTV-HVR1255
Signed-off-by: Michael Krufky <mkrufky@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-dvb.c')
-rw-r--r--drivers/media/video/cx23885/cx23885-dvb.c21
1 files changed, 21 insertions, 0 deletions
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index 7e354a93e89a..b440b55f22c9 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -197,6 +197,16 @@ static struct s5h1411_config dvico_s5h1411_config = {
197 .mpeg_timing = S5H1411_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK, 197 .mpeg_timing = S5H1411_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,
198}; 198};
199 199
200static struct s5h1411_config hcw_s5h1411_config = {
201 .output_mode = S5H1411_SERIAL_OUTPUT,
202 .gpio = S5H1411_GPIO_OFF,
203 .vsb_if = S5H1411_IF_44000,
204 .qam_if = S5H1411_IF_4000,
205 .inversion = S5H1411_INVERSION_ON,
206 .status_mode = S5H1411_DEMODLOCKING,
207 .mpeg_timing = S5H1411_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,
208};
209
200static struct xc5000_config hauppauge_hvr1500q_tunerconfig = { 210static struct xc5000_config hauppauge_hvr1500q_tunerconfig = {
201 .i2c_address = 0x61, 211 .i2c_address = 0x61,
202 .if_khz = 5380, 212 .if_khz = 5380,
@@ -433,6 +443,17 @@ static int dvb_register(struct cx23885_tsport *port)
433 &hcw_lgdt3305_tda18271_config); 443 &hcw_lgdt3305_tda18271_config);
434 } 444 }
435 break; 445 break;
446 case CX23885_BOARD_HAUPPAUGE_HVR1255:
447 i2c_bus = &dev->i2c_bus[0];
448 fe0->dvb.frontend = dvb_attach(s5h1411_attach,
449 &hcw_s5h1411_config,
450 &i2c_bus->i2c_adap);
451 if (fe0->dvb.frontend != NULL) {
452 dvb_attach(tda18271_attach, fe0->dvb.frontend,
453 0x60, &dev->i2c_bus[1].i2c_adap,
454 &hauppauge_tda18271_config);
455 }
456 break;
436 case CX23885_BOARD_HAUPPAUGE_HVR1800: 457 case CX23885_BOARD_HAUPPAUGE_HVR1800:
437 i2c_bus = &dev->i2c_bus[0]; 458 i2c_bus = &dev->i2c_bus[0];
438 switch (alt_tuner) { 459 switch (alt_tuner) {