14 files changed, 306 insertions, 157 deletions
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 922c205a2652..8e33a850e13e 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -130,7 +130,7 @@ static void init_av7110_av(struct av7110 *av7110)
        av7110->current_input = 0;
        if (i2c_writereg(av7110, 0x20, 0x00, 0x00) == 1) {
                printk ("dvb-ttpci: Crystal audio DAC @ card %d detected\n",
-                        av7110->dvb_adapter->num);
+                        av7110->dvb_adapter.num);
                av7110->adac_type = DVB_ADAC_CRYSTAL;
                i2c_writereg(av7110, 0x20, 0x01, 0xd2);
                i2c_writereg(av7110, 0x20, 0x02, 0x49);
@@ -145,13 +145,13 @@ static void init_av7110_av(struct av7110 *av7110)
        }
        else if (dev->pci->subsystem_vendor == 0x110a) {
                printk("dvb-ttpci: DVB-C w/o analog module @ card %d detected\n",
-                        av7110->dvb_adapter->num);
+                        av7110->dvb_adapter.num);
                av7110->adac_type = DVB_ADAC_NONE;
        }
        else {
                av7110->adac_type = adac;
                printk("dvb-ttpci: adac type set to %d @ card %d\n",
-                        av7110->dvb_adapter->num, av7110->adac_type);
+                        av7110->dvb_adapter.num, av7110->adac_type);
        }
        if (av7110->adac_type == DVB_ADAC_NONE || av7110->adac_type == DVB_ADAC_MSP) {
@@ -231,7 +231,7 @@ static int arm_thread(void *data)
                if (newloops == av7110->arm_loops) {
                        printk(KERN_ERR "dvb-ttpci: ARM crashed @ card %d\n",
-                               av7110->dvb_adapter->num);
+                               av7110->dvb_adapter.num);
                        arm_error(av7110);
                        av7710_set_video_mode(av7110, vidmode);
@@ -1282,7 +1282,7 @@ static int av7110_register(struct av7110 *av7110)
        av7110->dmxdev.demux = &dvbdemux->dmx;
        av7110->dmxdev.capabilities = 0;
-        dvb_dmxdev_init(&av7110->dmxdev, av7110->dvb_adapter);
+        dvb_dmxdev_init(&av7110->dmxdev, &av7110->dvb_adapter);
        av7110->hw_frontend.source = DMX_FRONTEND_0;
@@ -1307,11 +1307,11 @@ static int av7110_register(struct av7110 *av7110)
        av7110_ca_register(av7110);
 #ifdef CONFIG_DVB_AV7110_OSD
-        dvb_register_device(av7110->dvb_adapter, &av7110->osd_dev,
+        dvb_register_device(&av7110->dvb_adapter, &av7110->osd_dev,
                            &dvbdev_osd, av7110, DVB_DEVICE_OSD);
 #endif
-        dvb_net_init(av7110->dvb_adapter, &av7110->dvb_net, &dvbdemux->dmx);
+        dvb_net_init(&av7110->dvb_adapter, &av7110->dvb_net, &dvbdemux->dmx);
        if (budgetpatch) {
                /* initialize software demux1 without its own frontend
@@ -1334,9 +1334,9 @@ static int av7110_register(struct av7110 *av7110)
                av7110->dmxdev1.demux = &dvbdemux1->dmx;
                av7110->dmxdev1.capabilities = 0;
-                dvb_dmxdev_init(&av7110->dmxdev1, av7110->dvb_adapter);
+                dvb_dmxdev_init(&av7110->dmxdev1, &av7110->dvb_adapter);
-                dvb_net_init(av7110->dvb_adapter, &av7110->dvb_net1, &dvbdemux1->dmx);
+                dvb_net_init(&av7110->dvb_adapter, &av7110->dvb_net1, &dvbdemux1->dmx);
                printk("dvb-ttpci: additional demux1 for budget-patch registered\n");
        }
        return 0;
@@ -1673,6 +1673,106 @@ static struct stv0299_config alps_bsru6_config = {
 };
+static u8 alps_bsbe1_inittab[] = {
+        0x01, 0x15,
+        0x02, 0x30,
+        0x03, 0x00,
+        0x04, 0x7d,   /* F22FR = 0x7d, F22 = f_VCO / 128 / 0x7d = 22 kHz */
+        0x05, 0x35,   /* I2CT = 0, SCLT = 1, SDAT = 1 */
+        0x06, 0x40,   /* DAC not used, set to high impendance mode */
+        0x07, 0x00,   /* DAC LSB */
+        0x08, 0x40,   /* DiSEqC off, LNB power on OP2/LOCK pin on */
+        0x09, 0x00,   /* FIFO */
+        0x0c, 0x51,   /* OP1 ctl = Normal, OP1 val = 1 (LNB Power ON) */
+        0x0d, 0x82,   /* DC offset compensation = ON, beta_agc1 = 2 */
+        0x0e, 0x23,   /* alpha_tmg = 2, beta_tmg = 3 */
+        0x10, 0x3f,   // AGC2  0x3d
+        0x11, 0x84,
+        0x12, 0xb5,   // Lock detect: -64  Carrier freq detect:on
+        0x15, 0xc9,   // lock detector threshold
+        0x16, 0x00,
+        0x17, 0x00,
+        0x18, 0x00,
+        0x19, 0x00,
+        0x1a, 0x00,
+        0x1f, 0x50,
+        0x20, 0x00,
+        0x21, 0x00,
+        0x22, 0x00,
+        0x23, 0x00,
+        0x28, 0x00,  // out imp: normal  out type: parallel FEC mode:0
+        0x29, 0x1e,  // 1/2 threshold
+        0x2a, 0x14,  // 2/3 threshold
+        0x2b, 0x0f,  // 3/4 threshold
+        0x2c, 0x09,  // 5/6 threshold
+        0x2d, 0x05,  // 7/8 threshold
+        0x2e, 0x01,
+        0x31, 0x1f,  // test all FECs
+        0x32, 0x19,  // viterbi and synchro search
+        0x33, 0xfc,  // rs control
+        0x34, 0x93,  // error control
+        0x0f, 0x92,
+        0xff, 0xff
+};
+static int alps_bsbe1_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
+{
+        struct av7110* av7110 = (struct av7110*) fe->dvb->priv;
+        int ret;
+        u8 data[4];
+        u32 div;
+        struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };
+        if ((params->frequency < 950000) || (params->frequency > 2150000))
+                return -EINVAL;
+        div = (params->frequency + (125 - 1)) / 125; // round correctly
+        data[0] = (div >> 8) & 0x7f;
+        data[1] = div & 0xff;
+        data[2] = 0x80 | ((div & 0x18000) >> 10) | 4;
+        data[3] = (params->frequency > 1530000) ? 0xE0 : 0xE4;
+        ret = i2c_transfer(&av7110->i2c_adap, &msg, 1);
+        return (ret != 1) ? -EIO : 0;
+}
+static struct stv0299_config alps_bsbe1_config = {
+        .demod_address = 0x68,
+        .inittab = alps_bsbe1_inittab,
+        .mclk = 88000000UL,
+        .invert = 1,
+        .enhanced_tuning = 0,
+        .skip_reinit = 0,
+        .min_delay_ms = 100,
+        .set_symbol_rate = alps_bsru6_set_symbol_rate,
+        .pll_set = alps_bsbe1_pll_set,
+};
+static int lnbp21_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)
+{
+        struct av7110* av7110 = (struct av7110*) fe->dvb->priv;
+        int ret;
+        u8 data[1];
+        struct i2c_msg msg = { .addr = 0x08, .flags = 0, .buf = data, .len = sizeof(data) };
+        switch(voltage) {
+        case SEC_VOLTAGE_OFF:
+                data[0] = 0x00;
+                break;
+        case SEC_VOLTAGE_13:
+                data[0] = 0x44;
+                break;
+        case SEC_VOLTAGE_18:
+                data[0] = 0x4c;
+                break;
+        default:
+                return -EINVAL;
+        };
+        ret = i2c_transfer(&av7110->i2c_adap, &msg, 1);
+        return (ret != 1) ? -EIO : 0;
+}
 static int alps_tdbe2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
 {
@@ -2116,6 +2216,14 @@ static int frontend_init(struct av7110 *av7110)
                                av7110->dev->i2c_bitrate = SAA7146_I2C_BUS_BIT_RATE_240;
                                break;
                        }
+                        break;
+                case 0x000E: /* Hauppauge/TT Nexus-S rev 2.3 */
+                        /* ALPS BSBE1 */
+                        av7110->fe = stv0299_attach(&alps_bsbe1_config, &av7110->i2c_adap);
+                        if (av7110->fe)
+                                av7110->fe->ops->set_voltage = lnbp21_set_voltage;
+                        break;
                }
        }
@@ -2138,7 +2246,7 @@ static int frontend_init(struct av7110 *av7110)
                FE_FUNC_OVERRIDE(av7110->fe->ops->dishnetwork_send_legacy_command, av7110->fe_dishnetwork_send_legacy_command, av7110_fe_dishnetwork_send_legacy_command);
                FE_FUNC_OVERRIDE(av7110->fe->ops->set_frontend, av7110->fe_set_frontend, av7110_fe_set_frontend);
-                ret = dvb_register_frontend(av7110->dvb_adapter, av7110->fe);
+                ret = dvb_register_frontend(&av7110->dvb_adapter, av7110->fe);
                if (ret < 0) {
                        printk("av7110: Frontend registration failed!\n");
                        if (av7110->fe->ops->release)
@@ -2352,7 +2460,7 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d
                goto err_dvb_unregister_adapter_2;
        ttpci_eeprom_parse_mac(&av7110->i2c_adap,
-                               av7110->dvb_adapter->proposed_mac);
+                               av7110->dvb_adapter.proposed_mac);
        ret = -ENOMEM;
        if (budgetpatch) {
@@ -2523,7 +2631,7 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d
        if (ret < 0)
                goto err_av7110_unregister_11;
-        av7110->dvb_adapter->priv = av7110;
+        av7110->dvb_adapter.priv = av7110;
        ret = frontend_init(av7110);
        if (ret < 0)
                goto err_av7110_exit_v4l_12;
@@ -2558,7 +2666,7 @@ err_saa71466_vfree_4:
 err_i2c_del_3:
        i2c_del_adapter(&av7110->i2c_adap);
 err_dvb_unregister_adapter_2:
-        dvb_unregister_adapter(av7110->dvb_adapter);
+        dvb_unregister_adapter(&av7110->dvb_adapter);
 err_put_firmware_1:
        put_firmware(av7110);
 err_kfree_0:
@@ -2604,7 +2712,7 @@ static int av7110_detach(struct saa7146_dev* saa)
        i2c_del_adapter(&av7110->i2c_adap);
-        dvb_unregister_adapter (av7110->dvb_adapter);
+        dvb_unregister_adapter (&av7110->dvb_adapter);
        av7110_num--;
@@ -2672,21 +2780,23 @@ MAKE_AV7110_INFO(ttt_1_X,    "Technotrend/Hauppauge WinTV DVB-T rev1.X");
 MAKE_AV7110_INFO(ttc_1_X,    "Technotrend/Hauppauge WinTV Nexus-CA rev1.X");
 MAKE_AV7110_INFO(ttc_2_X,    "Technotrend/Hauppauge WinTV DVB-C rev2.X");
 MAKE_AV7110_INFO(tts_2_X,    "Technotrend/Hauppauge WinTV Nexus-S rev2.X");
+MAKE_AV7110_INFO(tts_2_3,    "Technotrend/Hauppauge WinTV Nexus-S rev2.3");
 MAKE_AV7110_INFO(tts_1_3se,  "Technotrend/Hauppauge WinTV DVB-S rev1.3 SE");
 MAKE_AV7110_INFO(ttt,        "Technotrend/Hauppauge DVB-T");
 MAKE_AV7110_INFO(fsc,        "Fujitsu Siemens DVB-C");
 MAKE_AV7110_INFO(fss,        "Fujitsu Siemens DVB-S rev1.6");
 static struct pci_device_id pci_tbl[] = {
+        MAKE_EXTENSION_PCI(fsc,       0x110a, 0x0000),
        MAKE_EXTENSION_PCI(tts_1_X,   0x13c2, 0x0000),
        MAKE_EXTENSION_PCI(ttt_1_X,   0x13c2, 0x0001),
        MAKE_EXTENSION_PCI(ttc_2_X,   0x13c2, 0x0002),
        MAKE_EXTENSION_PCI(tts_2_X,   0x13c2, 0x0003),
-        MAKE_EXTENSION_PCI(tts_1_3se, 0x13c2, 0x1002),
-        MAKE_EXTENSION_PCI(fsc,       0x110a, 0x0000),
-        MAKE_EXTENSION_PCI(ttc_1_X,   0x13c2, 0x000a),
        MAKE_EXTENSION_PCI(fss,       0x13c2, 0x0006),
        MAKE_EXTENSION_PCI(ttt,       0x13c2, 0x0008),
+        MAKE_EXTENSION_PCI(ttc_1_X,   0x13c2, 0x000a),
+        MAKE_EXTENSION_PCI(tts_2_3,   0x13c2, 0x000e),
+        MAKE_EXTENSION_PCI(tts_1_3se, 0x13c2, 0x1002),
 /*      MAKE_EXTENSION_PCI(???, 0x13c2, 0x0004), UNDEFINED CARD */ // Galaxis DVB PC-Sat-Carte
 /*      MAKE_EXTENSION_PCI(???, 0x13c2, 0x0005), UNDEFINED CARD */ // Technisat SkyStar1
diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/dvb/ttpci/av7110.h
index 5070e0523da7..4f69b4d01479 100644
--- a/drivers/media/dvb/ttpci/av7110.h
+++ b/drivers/media/dvb/ttpci/av7110.h
@@ -220,7 +220,7 @@ struct av7110 {
        struct audio_mixer      mixer;
-        struct dvb_adapter       *dvb_adapter;
+        struct dvb_adapter       dvb_adapter;
        struct dvb_device        *video_dev;
        struct dvb_device        *audio_dev;
        struct dvb_device        *ca_dev;
@@ -274,7 +274,6 @@ extern void av7110_ir_exit (void);
 extern int i2c_writereg(struct av7110 *av7110, u8 id, u8 reg, u8 val);
 extern u8 i2c_readreg(struct av7110 *av7110, u8 id, u8 reg);
 extern int msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val);
-extern int msp_readreg(struct av7110 *av7110, u8 dev, u16 reg, u16 *val);
 extern int av7110_init_analog_module(struct av7110 *av7110);
diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c
index d77e8a00688f..ccf946125d02 100644
--- a/drivers/media/dvb/ttpci/av7110_av.c
+++ b/drivers/media/dvb/ttpci/av7110_av.c
@@ -1075,7 +1075,7 @@ static int dvb_video_ioctl(struct inode *inode, struct file *file,
                }
                if (ret < 0)
                        break;
-                av7110->videostate.video_format = format;
+                av7110->videostate.display_format = format;
                ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetPanScanType,
                                    1, (u16) val);
                break;
@@ -1230,14 +1230,20 @@ static int dvb_audio_ioctl(struct inode *inode, struct file *file,
                switch(av7110->audiostate.channel_select) {
                case AUDIO_STEREO:
                        audcom(av7110, AUDIO_CMD_STEREO);
+                        if (av7110->adac_type == DVB_ADAC_CRYSTAL)
+                                i2c_writereg(av7110, 0x20, 0x02, 0x49);
                        break;
                case AUDIO_MONO_LEFT:
                        audcom(av7110, AUDIO_CMD_MONO_L);
+                        if (av7110->adac_type == DVB_ADAC_CRYSTAL)
+                                i2c_writereg(av7110, 0x20, 0x02, 0x4a);
                        break;
                case AUDIO_MONO_RIGHT:
                        audcom(av7110, AUDIO_CMD_MONO_R);
+                        if (av7110->adac_type == DVB_ADAC_CRYSTAL)
+                                i2c_writereg(av7110, 0x20, 0x02, 0x45);
                        break;
                default:
@@ -1409,10 +1415,10 @@ int av7110_av_register(struct av7110 *av7110)
        av7110->video_events.overflow = 0;
        memset(&av7110->video_size, 0, sizeof (video_size_t));
-        dvb_register_device(av7110->dvb_adapter, &av7110->video_dev,
+        dvb_register_device(&av7110->dvb_adapter, &av7110->video_dev,
                            &dvbdev_video, av7110, DVB_DEVICE_VIDEO);
-        dvb_register_device(av7110->dvb_adapter, &av7110->audio_dev,
+        dvb_register_device(&av7110->dvb_adapter, &av7110->audio_dev,
                            &dvbdev_audio, av7110, DVB_DEVICE_AUDIO);
        return 0;
diff --git a/drivers/media/dvb/ttpci/av7110_ca.c b/drivers/media/dvb/ttpci/av7110_ca.c
index 21f7aacf7726..c3801e328fe9 100644
--- a/drivers/media/dvb/ttpci/av7110_ca.c
+++ b/drivers/media/dvb/ttpci/av7110_ca.c
@@ -123,7 +123,7 @@ static void ci_ll_release(struct dvb_ringbuffer *cirbuf, struct dvb_ringbuffer *
 }
 static int ci_ll_reset(struct dvb_ringbuffer *cibuf, struct file *file,
-                int slots, ca_slot_info_t *slot)
+                       int slots, ca_slot_info_t *slot)
 {
        int i;
        int len = 0;
@@ -370,7 +370,7 @@ static struct dvb_device dvbdev_ca = {
 int av7110_ca_register(struct av7110 *av7110)
 {
-        return dvb_register_device(av7110->dvb_adapter, &av7110->ca_dev,
+        return dvb_register_device(&av7110->dvb_adapter, &av7110->ca_dev,
                                   &dvbdev_ca, av7110, DVB_DEVICE_CA);
 }
diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/dvb/ttpci/av7110_hw.c
index bd6e5ea4aefe..7fa4a0ebe133 100644
--- a/drivers/media/dvb/ttpci/av7110_hw.c
+++ b/drivers/media/dvb/ttpci/av7110_hw.c
@@ -104,7 +104,7 @@ u32 av7110_debiread(struct av7110 *av7110, u32 config, int addr, int count)
 /* av7110 ARM core boot stuff */
+#if 0
 void av7110_reset_arm(struct av7110 *av7110)
 {
        saa7146_setgpio(av7110->dev, RESET_LINE, SAA7146_GPIO_OUTLO);
@@ -124,7 +124,7 @@ void av7110_reset_arm(struct av7110 *av7110)
        av7110->arm_ready = 1;
        dprintk(1, "reset ARM\n");
 }
+#endif  /*  0  */
 static int waitdebi(struct av7110 *av7110, int adr, int state)
 {
@@ -335,7 +335,7 @@ int av7110_wait_msgstate(struct av7110 *av7110, u16 flags)
        return 0;
 }
-int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
+static int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
 {
        int i;
        unsigned long start;
@@ -455,7 +455,7 @@ int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
        return 0;
 }
-int av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
+static int av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
 {
        int ret;
@@ -500,6 +500,7 @@ int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...)
        return ret;
 }
+#if 0
 int av7110_send_ci_cmd(struct av7110 *av7110, u8 subcom, u8 *buf, u8 len)
 {
        int i, ret;
@@ -521,6 +522,7 @@ int av7110_send_ci_cmd(struct av7110 *av7110, u8 subcom, u8 *buf, u8 len)
                printk(KERN_ERR "dvb-ttpci: av7110_send_ci_cmd error %d\n", ret);
        return ret;
 }
+#endif  /*  0  */
 int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
                      int request_buf_len, u16 *reply_buf, int reply_buf_len)
@@ -593,7 +595,7 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
        return 0;
 }
-int av7110_fw_query(struct av7110 *av7110, u16 tag, u16* buf, s16 length)
+static int av7110_fw_query(struct av7110 *av7110, u16 tag, u16* buf, s16 length)
 {
        int ret;
        ret = av7110_fw_request(av7110, &tag, 0, buf, length);
@@ -617,7 +619,7 @@ int av7110_firmversion(struct av7110 *av7110)
        if (av7110_fw_query(av7110, tag, buf, 16)) {
                printk("dvb-ttpci: failed to boot firmware @ card %d\n",
-                       av7110->dvb_adapter->num);
+                       av7110->dvb_adapter.num);
                return -EIO;
        }
@@ -628,16 +630,16 @@ int av7110_firmversion(struct av7110 *av7110)
        av7110->avtype = (buf[8] << 16) + buf[9];
        printk("dvb-ttpci: info @ card %d: firm %08x, rtsl %08x, vid %08x, app %08x\n",
-               av7110->dvb_adapter->num, av7110->arm_fw,
+               av7110->dvb_adapter.num, av7110->arm_fw,
               av7110->arm_rtsl, av7110->arm_vid, av7110->arm_app);
        /* print firmware capabilities */
        if (FW_CI_LL_SUPPORT(av7110->arm_app))
                printk("dvb-ttpci: firmware @ card %d supports CI link layer interface\n",
-                       av7110->dvb_adapter->num);
+                       av7110->dvb_adapter.num);
        else
                printk("dvb-ttpci: no firmware support for CI link layer interface @ card %d\n",
-                       av7110->dvb_adapter->num);
+                       av7110->dvb_adapter.num);
        return 0;
 }
diff --git a/drivers/media/dvb/ttpci/av7110_hw.h b/drivers/media/dvb/ttpci/av7110_hw.h
index bf901c624682..52061e17c6dd 100644
--- a/drivers/media/dvb/ttpci/av7110_hw.h
+++ b/drivers/media/dvb/ttpci/av7110_hw.h
@@ -364,7 +364,6 @@ enum av7110_command_type {
-extern void av7110_reset_arm(struct av7110 *av7110);
 extern int av7110_bootarm(struct av7110 *av7110);
 extern int av7110_firmversion(struct av7110 *av7110);
 #define FW_CI_LL_SUPPORT(arm_app) ((arm_app) & 0x80000000)
@@ -373,12 +372,8 @@ extern int av7110_firmversion(struct av7110 *av7110);
 extern int av7110_wait_msgstate(struct av7110 *av7110, u16 flags);
 extern int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...);
-extern int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length);
-extern int av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length);
-extern int av7110_send_ci_cmd(struct av7110 *av7110, u8 subcom, u8 *buf, u8 len);
 extern int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
                             int request_buf_len, u16 *reply_buf, int reply_buf_len);
-extern int av7110_fw_query(struct av7110 *av7110, u16 tag, u16* Buff, s16 length);
 /* DEBI (saa7146 data extension bus interface) access */
diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/dvb/ttpci/av7110_ir.c
index 6d2256f1e354..665cdb8a3f71 100644
--- a/drivers/media/dvb/ttpci/av7110_ir.c
+++ b/drivers/media/dvb/ttpci/av7110_ir.c
@@ -10,7 +10,7 @@
 #define UP_TIMEOUT (HZ/4)
-/* enable ir debugging by or'ing av7110_debug with 16 */
+/* enable ir debugging by or'ing debug with 16 */
 static int ir_initialized;
 static struct input_dev input_dev;
diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c
index eb84fb08d95c..e65fc36e2ce8 100644
--- a/drivers/media/dvb/ttpci/av7110_v4l.c
+++ b/drivers/media/dvb/ttpci/av7110_v4l.c
@@ -46,13 +46,13 @@ int msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val)
        if (i2c_transfer(&av7110->i2c_adap, &msgs, 1) != 1) {
                dprintk(1, "dvb-ttpci: failed @ card %d, %u = %u\n",
-                       av7110->dvb_adapter->num, reg, val);
+                       av7110->dvb_adapter.num, reg, val);
                return -EIO;
        }
        return 0;
 }
-int msp_readreg(struct av7110 *av7110, u8 dev, u16 reg, u16 *val)
+static int msp_readreg(struct av7110 *av7110, u8 dev, u16 reg, u16 *val)
 {
        u8 msg1[3] = { dev, reg >> 8, reg & 0xff };
        u8 msg2[2];
@@ -63,7 +63,7 @@ int msp_readreg(struct av7110 *av7110, u8 dev, u16 reg, u16 *val)
        if (i2c_transfer(&av7110->i2c_adap, &msgs[0], 2) != 2) {
                dprintk(1, "dvb-ttpci: failed @ card %d, %u\n",
-                       av7110->dvb_adapter->num, reg);
+                       av7110->dvb_adapter.num, reg);
                return -EIO;
        }
        *val = (msg2[0] << 8) | msg2[1];
@@ -552,13 +552,13 @@ int av7110_init_analog_module(struct av7110 *av7110)
                return -ENODEV;
        printk("dvb-ttpci: DVB-C analog module @ card %d detected, initializing MSP3400\n",
-                av7110->dvb_adapter->num);
+                av7110->dvb_adapter.num);
        av7110->adac_type = DVB_ADAC_MSP;
        msleep(100); // the probing above resets the msp...
        msp_readreg(av7110, MSP_RD_DSP, 0x001e, &version1);
        msp_readreg(av7110, MSP_RD_DSP, 0x001f, &version2);
        dprintk(1, "dvb-ttpci: @ card %d MSP3400 version 0x%04x 0x%04x\n",
-                av7110->dvb_adapter->num, version1, version2);
+                av7110->dvb_adapter.num, version1, version2);
        msp_writereg(av7110, MSP_WR_DSP, 0x0013, 0x0c00);
        msp_writereg(av7110, MSP_WR_DSP, 0x0000, 0x7f00); // loudspeaker + headphone
        msp_writereg(av7110, MSP_WR_DSP, 0x0008, 0x0220); // loudspeaker source
@@ -596,7 +596,7 @@ int av7110_init_analog_module(struct av7110 *av7110)
                /* init the saa7113 */
                while (*i != 0xff) {
                        if (i2c_writereg(av7110, 0x48, i[0], i[1]) != 1) {
-                                dprintk(1, "saa7113 initialization failed @ card %d", av7110->dvb_adapter->num);
+                                dprintk(1, "saa7113 initialization failed @ card %d", av7110->dvb_adapter.num);
                                break;
                        }
                        i += 2;
@@ -726,11 +726,11 @@ static int std_callback(struct saa7146_dev* dev, struct saa7146_standard *std)
 {
        struct av7110 *av7110 = (struct av7110*) dev->ext_priv;
-        if (std->id == V4L2_STD_PAL) {
+        if (std->id & V4L2_STD_PAL) {
                av7110->vidmode = VIDEO_MODE_PAL;
                av7110_set_vidmode(av7110, av7110->vidmode);
        }
-        else if (std->id == V4L2_STD_NTSC) {
+        else if (std->id & V4L2_STD_NTSC) {
                av7110->vidmode = VIDEO_MODE_NTSC;
                av7110_set_vidmode(av7110, av7110->vidmode);
        }
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c
index 14e963206b89..6e0f5d307c52 100644
--- a/drivers/media/dvb/ttpci/budget-av.c
+++ b/drivers/media/dvb/ttpci/budget-av.c
@@ -59,8 +59,12 @@ struct budget_av {
        struct dvb_ca_en50221 ca;
 };
-static int enable_ci = 0;
+/* GPIO CI Connections:
+ * 0 - Vcc/Reset (Reset is controlled by capacitor)
+ * 1 - Attribute Memory
+ * 2 - Card Enable (Active Low)
+ * 3 - Card Detect
+ */
 /****************************************************************************
 * INITIALIZATION
@@ -188,22 +192,35 @@ static int ciintf_slot_reset(struct dvb_ca_en50221 *ca, int slot)
 {
        struct budget_av *budget_av = (struct budget_av *) ca->data;
        struct saa7146_dev *saa = budget_av->budget.dev;
-        int max = 20;
+        int timeout = 50; // 5 seconds (4.4.6 Ready)
        if (slot != 0)
                return -EINVAL;
        dprintk(1, "ciintf_slot_reset\n");
-        /* reset the card */
+        saa7146_setgpio(saa, 2, SAA7146_GPIO_OUTHI); /* disable card */
-        saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTHI);
-        msleep(100);
-        saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTLO);
-        while (--max > 0 && ciintf_read_attribute_mem(ca, slot, 0) != 0x1d)
+        saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTHI); /* Vcc off */
+        msleep(2);
+        saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTLO); /* Vcc on */
+        msleep(20); /* 20 ms Vcc settling time */
+        saa7146_setgpio(saa, 2, SAA7146_GPIO_OUTLO); /* enable card */
+        /* This should have been based on pin 16 READY of the pcmcia port,
+         * but AFAICS it is not routed to the saa7146 */
+        while (--timeout > 0 && ciintf_read_attribute_mem(ca, slot, 0) != 0x1d)
                msleep(100);
-        ttpci_budget_set_video_port(saa, BUDGET_VIDEO_PORTB);
+        if (timeout <= 0)
+        {
+                printk(KERN_ERR "budget-av: cam reset failed (timeout).\n");
+                saa7146_setgpio(saa, 2, SAA7146_GPIO_OUTHI); /* disable card */
+                saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTHI); /* Vcc off */
+                return -ETIMEDOUT;
+        }
        return 0;
 }
@@ -240,7 +257,6 @@ static int ciintf_poll_slot_status(struct dvb_ca_en50221 *ca, int slot, int open
 {
        struct budget_av *budget_av = (struct budget_av *) ca->data;
        struct saa7146_dev *saa = budget_av->budget.dev;
-        int cam = 0;
        if (slot != 0)
                return -EINVAL;
@@ -248,15 +264,21 @@ static int ciintf_poll_slot_status(struct dvb_ca_en50221 *ca, int slot, int open
        if (!budget_av->slot_status) {
                saa7146_setgpio(saa, 3, SAA7146_GPIO_INPUT);
                udelay(1);
-                cam = saa7146_read(saa, PSR) & MASK_06;
+                if (saa7146_read(saa, PSR) & MASK_06)
-                saa7146_setgpio(saa, 3, SAA7146_GPIO_OUTLO);
+                {
+                        printk(KERN_INFO "budget-av: cam inserted\n");
-                if (cam)
                        budget_av->slot_status = 1;
+                }
+                saa7146_setgpio(saa, 3, SAA7146_GPIO_OUTLO);
        } else if (!open) {
                saa7146_setgpio(budget_av->budget.dev, 1, SAA7146_GPIO_OUTLO);
                if (ttpci_budget_debiread(&budget_av->budget, DEBICICAM, 0, 1, 0, 1) == -ETIMEDOUT)
+                {
+                        printk(KERN_INFO "budget-av: cam ejected\n");
+                        saa7146_setgpio(saa, 2, SAA7146_GPIO_OUTHI); /* disable card */
+                        saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTHI); /* Vcc off */
                        budget_av->slot_status = 0;
+                }
        }
        if (budget_av->slot_status == 1)
@@ -272,17 +294,11 @@ static int ciintf_init(struct budget_av *budget_av)
        memset(&budget_av->ca, 0, sizeof(struct dvb_ca_en50221));
-        /* setup GPIOs */
+        saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTLO);
-        saa7146_setgpio(saa, 1, SAA7146_GPIO_OUTHI);
+        saa7146_setgpio(saa, 1, SAA7146_GPIO_OUTLO);
        saa7146_setgpio(saa, 2, SAA7146_GPIO_OUTLO);
        saa7146_setgpio(saa, 3, SAA7146_GPIO_OUTLO);
-        /* Reset the card */
-        saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTHI);
-        msleep(50);
-        saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTLO);
-        msleep(100);
        /* Enable DEBI pins */
        saa7146_write(saa, MC1, saa7146_read(saa, MC1) | (0x800 << 16) | 0x800);
@@ -297,13 +313,14 @@ static int ciintf_init(struct budget_av *budget_av)
        budget_av->ca.slot_ts_enable = ciintf_slot_ts_enable;
        budget_av->ca.poll_slot_status = ciintf_poll_slot_status;
        budget_av->ca.data = budget_av;
-        if ((result = dvb_ca_en50221_init(budget_av->budget.dvb_adapter,
+        if ((result = dvb_ca_en50221_init(&budget_av->budget.dvb_adapter,
                                          &budget_av->ca, 0, 1)) != 0) {
-                printk("budget_av: CI interface detected, but initialisation failed.\n");
+                printk(KERN_ERR "budget-av: ci initialisation failed.\n");
                goto error;
        }
-        // success!
-        printk("ciintf_init: CI interface initialised\n");
+        printk(KERN_INFO "budget-av: ci interface initialised.\n");
        budget_av->budget.ci_present = 1;
        return 0;
@@ -361,8 +378,12 @@ static const u8 saa7113_tab[] = {
 static int saa7113_init(struct budget_av *budget_av)
 {
        struct budget *budget = &budget_av->budget;
+        struct saa7146_dev *saa = budget->dev;
        const u8 *data = saa7113_tab;
+        saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTHI);
+        msleep(200);
        if (i2c_writereg(&budget->i2c_adap, 0x4a, 0x01, 0x08) != 1) {
                dprintk(1, "saa7113 not found on KNC card\n");
                return -ENODEV;
@@ -697,75 +718,90 @@ static u8 read_pwm(struct budget_av *budget_av)
        return pwm;
 }
+#define SUBID_DVBS_KNC1         0x0010
+#define SUBID_DVBS_KNC1_PLUS    0x0011
+#define SUBID_DVBS_TYPHOON      0x4f56
+#define SUBID_DVBS_CINERGY1200  0x1154
+#define SUBID_DVBC_KNC1         0x0020
+#define SUBID_DVBC_KNC1_PLUS    0x0021
+#define SUBID_DVBC_CINERGY1200  0x1156
+#define SUBID_DVBT_KNC1_PLUS    0x0031
+#define SUBID_DVBT_KNC1         0x0030
+#define SUBID_DVBT_CINERGY1200  0x1157
 static void frontend_init(struct budget_av *budget_av)
 {
-        switch (budget_av->budget.dev->pci->subsystem_device) {
+        struct saa7146_dev * saa = budget_av->budget.dev;
-        case 0x4f56:            // Typhoon/KNC1 DVB-S budget (stv0299/Philips SU1278(tsa5059))
+        struct dvb_frontend * fe = NULL;
-                budget_av->budget.dvb_frontend =
-                        stv0299_attach(&typhoon_config, &budget_av->budget.i2c_adap);
+        switch (saa->pci->subsystem_device) {
-                if (budget_av->budget.dvb_frontend != NULL) {
+                case SUBID_DVBS_KNC1_PLUS:
+                case SUBID_DVBC_KNC1_PLUS:
+                case SUBID_DVBT_KNC1_PLUS:
+                        // Enable / PowerON Frontend
+                        saa7146_setgpio(saa, 3, SAA7146_GPIO_OUTHI);
                        break;
-                }
+        }
+        switch (saa->pci->subsystem_device) {
+        case SUBID_DVBS_KNC1:
+        case SUBID_DVBS_KNC1_PLUS:
+        case SUBID_DVBS_TYPHOON:
+                fe = stv0299_attach(&typhoon_config,
+                                    &budget_av->budget.i2c_adap);
                break;
-        case 0x0020:            // KNC1 DVB-C budget (tda10021/Philips CU1216(tua6034))
+        case SUBID_DVBS_CINERGY1200:
-                budget_av->budget.dvb_frontend =
+                fe = stv0299_attach(&cinergy_1200s_config,
-                        tda10021_attach(&philips_cu1216_config,
+                                    &budget_av->budget.i2c_adap);
-                                        &budget_av->budget.i2c_adap, read_pwm(budget_av));
-                if (budget_av->budget.dvb_frontend != NULL) {
-                        break;
-                }
                break;
-        case 0x0030:            // KNC1 DVB-T budget (tda10046/Philips TU1216(tda6651tt))
+        case SUBID_DVBC_KNC1:
-                budget_av->budget.dvb_frontend =
+        case SUBID_DVBC_KNC1_PLUS:
-                        tda10046_attach(&philips_tu1216_config, &budget_av->budget.i2c_adap);
+                fe = tda10021_attach(&philips_cu1216_config,
-                if (budget_av->budget.dvb_frontend != NULL) {
+                                     &budget_av->budget.i2c_adap,
-                        break;
+                                     read_pwm(budget_av));
-                }
                break;
-        case 0x1154:            // TerraTec Cinergy 1200 DVB-S (stv0299/Philips SU1278(tsa5059))
+        case SUBID_DVBT_KNC1:
-                budget_av->budget.dvb_frontend =
+        case SUBID_DVBT_KNC1_PLUS:
-                        stv0299_attach(&cinergy_1200s_config, &budget_av->budget.i2c_adap);
+                fe = tda10046_attach(&philips_tu1216_config,
-                if (budget_av->budget.dvb_frontend != NULL) {
+                                     &budget_av->budget.i2c_adap);
-                        break;
-                }
                break;
-        case 0x1156:            // Terratec Cinergy 1200 DVB-C (tda10021/Philips CU1216(tua6034))
+        case SUBID_DVBC_CINERGY1200:
-                budget_av->budget.dvb_frontend =
+                fe = tda10021_attach(&philips_cu1216_config,
-                        tda10021_attach(&philips_cu1216_config,
+                                     &budget_av->budget.i2c_adap,
-                                        &budget_av->budget.i2c_adap, read_pwm(budget_av));
+                                     read_pwm(budget_av));
-                if (budget_av->budget.dvb_frontend) {
-                        break;
-                }
                break;
-        case 0x1157:            // Terratec Cinergy 1200 DVB-T (tda10046/Philips TU1216(tda6651tt))
+        case SUBID_DVBT_CINERGY1200:
-                budget_av->budget.dvb_frontend =
+                fe = tda10046_attach(&philips_tu1216_config,
-                        tda10046_attach(&philips_tu1216_config, &budget_av->budget.i2c_adap);
+                                     &budget_av->budget.i2c_adap);
-                if (budget_av->budget.dvb_frontend) {
-                        break;
-                }
                break;
        }
-        if (budget_av->budget.dvb_frontend == NULL) {
+        if (fe == NULL) {
-                printk("budget_av: A frontend driver was not found for device %04x/%04x subsystem %04x/%04x\n",
+                printk(KERN_ERR "budget-av: A frontend driver was not found "
-                       budget_av->budget.dev->pci->vendor,
+                                "for device %04x/%04x subsystem %04x/%04x\n",
-                       budget_av->budget.dev->pci->device,
+                       saa->pci->vendor,
-                       budget_av->budget.dev->pci->subsystem_vendor,
+                       saa->pci->device,
-                       budget_av->budget.dev->pci->subsystem_device);
+                       saa->pci->subsystem_vendor,
-        } else {
+                       saa->pci->subsystem_device);
-                if (dvb_register_frontend
+                return;
-                    (budget_av->budget.dvb_adapter, budget_av->budget.dvb_frontend)) {
+        }
-                        printk("budget-av: Frontend registration failed!\n");
-                        if (budget_av->budget.dvb_frontend->ops->release)
+        budget_av->budget.dvb_frontend = fe;
-                                budget_av->budget.dvb_frontend->ops->release(budget_av->budget.dvb_frontend);
-                        budget_av->budget.dvb_frontend = NULL;
+        if (dvb_register_frontend(&budget_av->budget.dvb_adapter,
-                }
+                                  budget_av->budget.dvb_frontend)) {
+                printk(KERN_ERR "budget-av: Frontend registration failed!\n");
+                if (budget_av->budget.dvb_frontend->ops->release)
+                        budget_av->budget.dvb_frontend->ops->release(budget_av->budget.dvb_frontend);
+                budget_av->budget.dvb_frontend = NULL;
        }
 }
@@ -822,6 +858,7 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
        memset(budget_av, 0, sizeof(struct budget_av));
+        budget_av->has_saa7113 = 0;
        budget_av->budget.ci_present = 0;
        dev->ext_priv = budget_av;
@@ -836,10 +873,7 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
        saa7146_write(dev, DD1_INIT, 0x07000600);
        saa7146_write(dev, MC2, MASK_09 | MASK_25 | MASK_10 | MASK_26);
-        saa7146_setgpio(dev, 0, SAA7146_GPIO_OUTHI);
+        if (saa7113_init(budget_av) == 0) {
-        msleep(500);
-        if (0 == saa7113_init(budget_av)) {
                budget_av->has_saa7113 = 1;
                if (0 != saa7146_vv_init(dev, &vv_data)) {
@@ -860,31 +894,26 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
                saa7113_setinput(budget_av, 0);
        } else {
-                budget_av->has_saa7113 = 0;
+                ciintf_init(budget_av);
-                saa7146_setgpio(dev, 0, SAA7146_GPIO_OUTLO);
        }
        /* fixme: find some sane values here... */
        saa7146_write(dev, PCI_BT_V1, 0x1c00101f);
-        mac = budget_av->budget.dvb_adapter->proposed_mac;
+        mac = budget_av->budget.dvb_adapter.proposed_mac;
        if (i2c_readregs(&budget_av->budget.i2c_adap, 0xa0, 0x30, mac, 6)) {
-                printk("KNC1-%d: Could not read MAC from KNC1 card\n",
+                printk(KERN_ERR "KNC1-%d: Could not read MAC from KNC1 card\n",
-                       budget_av->budget.dvb_adapter->num);
+                       budget_av->budget.dvb_adapter.num);
                memset(mac, 0, 6);
        } else {
-                printk("KNC1-%d: MAC addr = %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
+                printk(KERN_INFO "KNC1-%d: MAC addr = %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
-                       budget_av->budget.dvb_adapter->num,
+                       budget_av->budget.dvb_adapter.num,
                       mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
        }
-        budget_av->budget.dvb_adapter->priv = budget_av;
+        budget_av->budget.dvb_adapter.priv = budget_av;
        frontend_init(budget_av);
-        if (enable_ci)
-                ciintf_init(budget_av);
        return 0;
 }
@@ -963,14 +992,21 @@ static struct saa7146_extension budget_extension;
 MAKE_BUDGET_INFO(knc1s, "KNC1 DVB-S", BUDGET_KNC1S);
 MAKE_BUDGET_INFO(knc1c, "KNC1 DVB-C", BUDGET_KNC1C);
 MAKE_BUDGET_INFO(knc1t, "KNC1 DVB-T", BUDGET_KNC1T);
+MAKE_BUDGET_INFO(knc1sp, "KNC1 DVB-S Plus", BUDGET_KNC1SP);
+MAKE_BUDGET_INFO(knc1cp, "KNC1 DVB-C Plus", BUDGET_KNC1CP);
+MAKE_BUDGET_INFO(knc1tp, "KNC1 DVB-T Plus", BUDGET_KNC1TP);
 MAKE_BUDGET_INFO(cin1200s, "TerraTec Cinergy 1200 DVB-S", BUDGET_CIN1200S);
 MAKE_BUDGET_INFO(cin1200c, "Terratec Cinergy 1200 DVB-C", BUDGET_CIN1200C);
 MAKE_BUDGET_INFO(cin1200t, "Terratec Cinergy 1200 DVB-T", BUDGET_CIN1200T);
 static struct pci_device_id pci_tbl[] = {
        MAKE_EXTENSION_PCI(knc1s, 0x1131, 0x4f56),
+        MAKE_EXTENSION_PCI(knc1s, 0x1131, 0x0010),
+        MAKE_EXTENSION_PCI(knc1sp, 0x1131, 0x0011),
        MAKE_EXTENSION_PCI(knc1c, 0x1894, 0x0020),
+        MAKE_EXTENSION_PCI(knc1cp, 0x1894, 0x0021),
        MAKE_EXTENSION_PCI(knc1t, 0x1894, 0x0030),
+        MAKE_EXTENSION_PCI(knc1tp, 0x1894, 0x0031),
        MAKE_EXTENSION_PCI(cin1200s, 0x153b, 0x1154),
        MAKE_EXTENSION_PCI(cin1200c, 0x153b, 0x1156),
        MAKE_EXTENSION_PCI(cin1200t, 0x153b, 0x1157),
@@ -1010,5 +1046,3 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Ralph Metzler, Marcus Metzler, Michael Hunold, others");
 MODULE_DESCRIPTION("driver for the SAA7146 based so-called "
                   "budget PCI DVB w/ analog input and CI-module (e.g. the KNC cards)");
-module_param_named(enable_ci, enable_ci, int, 0644);
-MODULE_PARM_DESC(enable_ci, "Turn on/off CI module (default:off).");
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 521111be3558..dce116111376 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -395,7 +395,7 @@ static int ciintf_init(struct budget_ci *budget_ci)
        budget_ci->ca.slot_shutdown = ciintf_slot_shutdown;
        budget_ci->ca.slot_ts_enable = ciintf_slot_ts_enable;
        budget_ci->ca.data = budget_ci;
-        if ((result = dvb_ca_en50221_init(budget_ci->budget.dvb_adapter,
+        if ((result = dvb_ca_en50221_init(&budget_ci->budget.dvb_adapter,
                                          &budget_ci->ca,
                                          DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE |
                                          DVB_CA_EN50221_FLAG_IRQ_FR |
@@ -881,7 +881,7 @@ static void frontend_init(struct budget_ci *budget_ci)
                       budget_ci->budget.dev->pci->subsystem_device);
        } else {
                if (dvb_register_frontend
-                    (budget_ci->budget.dvb_adapter, budget_ci->budget.dvb_frontend)) {
+                    (&budget_ci->budget.dvb_adapter, budget_ci->budget.dvb_frontend)) {
                        printk("budget-ci: Frontend registration failed!\n");
                        if (budget_ci->budget.dvb_frontend->ops->release)
                                budget_ci->budget.dvb_frontend->ops->release(budget_ci->budget.dvb_frontend);
@@ -916,7 +916,7 @@ static int budget_ci_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
        ciintf_init(budget_ci);
-        budget_ci->budget.dvb_adapter->priv = budget_ci;
+        budget_ci->budget.dvb_adapter.priv = budget_ci;
        frontend_init(budget_ci);
        return 0;
diff --git a/drivers/media/dvb/ttpci/budget-core.c b/drivers/media/dvb/ttpci/budget-core.c
index 93a9b40917e4..0498a055a4cd 100644
--- a/drivers/media/dvb/ttpci/budget-core.c
+++ b/drivers/media/dvb/ttpci/budget-core.c
@@ -298,7 +298,7 @@ static int budget_register(struct budget *budget)
        budget->dmxdev.demux = &dvbdemux->dmx;
        budget->dmxdev.capabilities = 0;
-        dvb_dmxdev_init(&budget->dmxdev, budget->dvb_adapter);
+        dvb_dmxdev_init(&budget->dmxdev, &budget->dvb_adapter);
        budget->hw_frontend.source = DMX_FRONTEND_0;
@@ -316,7 +316,7 @@ static int budget_register(struct budget *budget)
        if (ret < 0)
                return ret;
-        dvb_net_init(budget->dvb_adapter, &budget->dvb_net, &dvbdemux->dmx);
+        dvb_net_init(&budget->dvb_adapter, &budget->dvb_net, &dvbdemux->dmx);
        return 0;
 }
@@ -385,11 +385,11 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
        strcpy(budget->i2c_adap.name, budget->card->name);
        if (i2c_add_adapter(&budget->i2c_adap) < 0) {
-                dvb_unregister_adapter(budget->dvb_adapter);
+                dvb_unregister_adapter(&budget->dvb_adapter);
                return -ENOMEM;
        }
-        ttpci_eeprom_parse_mac(&budget->i2c_adap, budget->dvb_adapter->proposed_mac);
+        ttpci_eeprom_parse_mac(&budget->i2c_adap, budget->dvb_adapter.proposed_mac);
        if (NULL ==
            (budget->grabbing = saa7146_vmalloc_build_pgtable(dev->pci, length, &budget->pt))) {
@@ -417,7 +417,7 @@ err:
        vfree(budget->grabbing);
-        dvb_unregister_adapter(budget->dvb_adapter);
+        dvb_unregister_adapter(&budget->dvb_adapter);
        return ret;
 }
@@ -432,7 +432,7 @@ int ttpci_budget_deinit(struct budget *budget)
        i2c_del_adapter(&budget->i2c_adap);
-        dvb_unregister_adapter(budget->dvb_adapter);
+        dvb_unregister_adapter(&budget->dvb_adapter);
        tasklet_kill(&budget->vpe_tasklet);
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c
index 5d524a4f213f..8142e26b47f5 100644
--- a/drivers/media/dvb/ttpci/budget-patch.c
+++ b/drivers/media/dvb/ttpci/budget-patch.c
@@ -453,7 +453,7 @@ static void frontend_init(struct budget_patch* budget)
                       budget->dev->pci->subsystem_vendor,
                       budget->dev->pci->subsystem_device);
        } else {
-                if (dvb_register_frontend(budget->dvb_adapter, budget->dvb_frontend)) {
+                if (dvb_register_frontend(&budget->dvb_adapter, budget->dvb_frontend)) {
                        printk("budget-av: Frontend registration failed!\n");
                        if (budget->dvb_frontend->ops->release)
                                budget->dvb_frontend->ops->release(budget->dvb_frontend);
@@ -702,7 +702,7 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
        dev->ext_priv = budget;
-        budget->dvb_adapter->priv = budget;
+        budget->dvb_adapter.priv = budget;
        frontend_init(budget);
        return 0;
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index 5e6a10f4ad95..083fd44e5f90 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -468,7 +468,7 @@ static void frontend_init(struct budget *budget)
                       budget->dev->pci->subsystem_vendor,
                       budget->dev->pci->subsystem_device);
        } else {
-                if (dvb_register_frontend(budget->dvb_adapter, budget->dvb_frontend)) {
+                if (dvb_register_frontend(&budget->dvb_adapter, budget->dvb_frontend)) {
                        printk("budget: Frontend registration failed!\n");
                        if (budget->dvb_frontend->ops->release)
                                budget->dvb_frontend->ops->release(budget->dvb_frontend);
@@ -497,7 +497,7 @@ static int budget_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_
                return err;
        }
-        budget->dvb_adapter->priv = budget;
+        budget->dvb_adapter.priv = budget;
        frontend_init(budget);
        return 0;
diff --git a/drivers/media/dvb/ttpci/budget.h b/drivers/media/dvb/ttpci/budget.h
index 10bd41f0363b..c6ef496ba70a 100644
--- a/drivers/media/dvb/ttpci/budget.h
+++ b/drivers/media/dvb/ttpci/budget.h
@@ -64,7 +64,7 @@ struct budget {
        spinlock_t debilock;
-        struct dvb_adapter *dvb_adapter;
+        struct dvb_adapter dvb_adapter;
        struct dvb_frontend *dvb_frontend;
        void *priv;
 };
@@ -92,6 +92,9 @@ static struct saa7146_pci_extension_data x_var = { \
 #define BUDGET_KNC1S               8
 #define BUDGET_KNC1C               9
 #define BUDGET_KNC1T               10
+#define BUDGET_KNC1SP              11
+#define BUDGET_KNC1CP              12
+#define BUDGET_KNC1TP              13
 #define BUDGET_VIDEO_PORTA         0
 #define BUDGET_VIDEO_PORTB         1