V4L/DVB (7412): use tuner-simple for LG TDVS-H06xF digital tuning support

[pandora-kernel.git] / drivers / media / video / cx23885 / cx23885-dvb.c

diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index ed465c0..42e6bdd 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -39,6 +39,7 @@
 #include "dvb-pll.h"
 #include "tuner-xc2028.h"
 #include "tuner-xc2028-types.h"
+#include "tuner-simple.h"
 
 static unsigned int debug;
 
@@ -164,8 +165,8 @@ static struct tda829x_config tda829x_no_probe = {
 };
 
 static struct tda18271_std_map hauppauge_tda18271_std_map = {
-       .atsc_6   = { .if_freq = 5380, .std_bits = 0x1b },
-       .qam_6    = { .if_freq = 4000, .std_bits = 0x18 },
+       .atsc_6   = { .if_freq = 5380, .agc_mode = 3, .std = 3 },
+       .qam_6    = { .if_freq = 4000, .agc_mode = 3, .std = 0 },
 };
 
 static struct tda18271_config hauppauge_tda18271_config = {
@@ -271,8 +272,9 @@ static int dvb_register(struct cx23885_tsport *port)
                                                &fusionhdtv_5_express,
                                                &i2c_bus->i2c_adap);
                if (port->dvb.frontend != NULL) {
-                       dvb_attach(dvb_pll_attach, port->dvb.frontend, 0x61,
-                                  &i2c_bus->i2c_adap, DVB_PLL_LG_TDVS_H06XF);
+                       dvb_attach(simple_tuner_attach, port->dvb.frontend,
+                                  &i2c_bus->i2c_adap, 0x61,
+                                  TUNER_LG_TDVS_H06XF);
                }
                break;
        case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
@@ -297,7 +299,6 @@ static int dvb_register(struct cx23885_tsport *port)
                        struct xc2028_config cfg = {
                                .i2c_adap  = &i2c_bus->i2c_adap,
                                .i2c_addr  = 0x61,
-                               .video_dev = port,
                                .callback  = cx23885_hvr1500_xc3028_callback,
                        };
                        static struct xc2028_ctrl ctl = {
@@ -349,7 +350,7 @@ int cx23885_dvb_register(struct cx23885_tsport *port)
 
        /* dvb stuff */
        printk("%s: cx23885 based dvb card\n", dev->name);
-       videobuf_queue_pci_init(&port->dvb.dvbq, &dvb_qops, dev->pci, &port->slock,
+       videobuf_queue_sg_init(&port->dvb.dvbq, &dvb_qops, &dev->pci->dev, &port->slock,
                            V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_TOP,
                            sizeof(struct cx23885_buffer), port);
        err = dvb_register(port);