6 files changed, 430 insertions, 100 deletions

diff --git a/drivers/media/dvb/ngene/Makefile b/drivers/media/dvb/ngene/Makefile
index 0608aabb14ee..2bc96874d044 100644
--- a/drivers/media/dvb/ngene/Makefile
+++ b/drivers/media/dvb/ngene/Makefile
@@ -9,3 +9,6 @@ obj-$(CONFIG_DVB_NGENE) += ngene.o
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/
 EXTRA_CFLAGS += -Idrivers/media/dvb/frontends/
 EXTRA_CFLAGS += -Idrivers/media/common/tuners/
+
+# For the staging CI driver cxd2099
+EXTRA_CFLAGS += -Idrivers/staging/cxd2099/
diff --git a/drivers/media/dvb/ngene/ngene-cards.c b/drivers/media/dvb/ngene/ngene-cards.c
index 4692a41ad95b..fcf4be901ec8 100644
--- a/drivers/media/dvb/ngene/ngene-cards.c
+++ b/drivers/media/dvb/ngene/ngene-cards.c
@@ -48,20 +48,27 @@
 
 static int tuner_attach_stv6110(struct ngene_channel *chan)
 {
+        struct i2c_adapter *i2c;
         struct stv090x_config *feconf = (struct stv090x_config *)
                 chan->dev->card_info->fe_config[chan->number];
         struct stv6110x_config *tunerconf = (struct stv6110x_config *)
                 chan->dev->card_info->tuner_config[chan->number];
         struct stv6110x_devctl *ctl;
 
-        ctl = dvb_attach(stv6110x_attach, chan->fe, tunerconf,
-                         &chan->i2c_adapter);
+        /* tuner 1+2: i2c adapter #0, tuner 3+4: i2c adapter #1 */
+        if (chan->number < 2)
+                i2c = &chan->dev->channel[0].i2c_adapter;
+        else
+                i2c = &chan->dev->channel[1].i2c_adapter;
+
+        ctl = dvb_attach(stv6110x_attach, chan->fe, tunerconf, i2c);
         if (ctl == NULL) {
                 printk(KERN_ERR DEVICE_NAME ": No STV6110X found!\n");
                 return -ENODEV;
         }
 
         feconf->tuner_init          = ctl->tuner_init;
+        feconf->tuner_sleep         = ctl->tuner_sleep;
         feconf->tuner_set_mode      = ctl->tuner_set_mode;
         feconf->tuner_set_frequency = ctl->tuner_set_frequency;
         feconf->tuner_get_frequency = ctl->tuner_get_frequency;
@@ -78,29 +85,106 @@ static int tuner_attach_stv6110(struct ngene_channel *chan)
 
 static int demod_attach_stv0900(struct ngene_channel *chan)
 {
+        struct i2c_adapter *i2c;
         struct stv090x_config *feconf = (struct stv090x_config *)
                 chan->dev->card_info->fe_config[chan->number];
 
-        chan->fe = dvb_attach(stv090x_attach,
-                        feconf,
-                        &chan->i2c_adapter,
-                        chan->number == 0 ? STV090x_DEMODULATOR_0 :
-                                            STV090x_DEMODULATOR_1);
+        /* tuner 1+2: i2c adapter #0, tuner 3+4: i2c adapter #1 */
+        /* Note: Both adapters share the same i2c bus, but the demod     */
+        /*       driver requires that each demod has its own i2c adapter */
+        if (chan->number < 2)
+                i2c = &chan->dev->channel[0].i2c_adapter;
+        else
+                i2c = &chan->dev->channel[1].i2c_adapter;
+
+        chan->fe = dvb_attach(stv090x_attach, feconf, i2c,
+                        (chan->number & 1) == 0 ? STV090x_DEMODULATOR_0
+                                                : STV090x_DEMODULATOR_1);
         if (chan->fe == NULL) {
                 printk(KERN_ERR DEVICE_NAME ": No STV0900 found!\n");
                 return -ENODEV;
         }
 
-        if (!dvb_attach(lnbh24_attach, chan->fe, &chan->i2c_adapter, 0,
+        /* store channel info */
+        if (feconf->tuner_i2c_lock)
+                chan->fe->analog_demod_priv = chan;
+
+        if (!dvb_attach(lnbh24_attach, chan->fe, i2c, 0,
                         0, chan->dev->card_info->lnb[chan->number])) {
                 printk(KERN_ERR DEVICE_NAME ": No LNBH24 found!\n");
                 dvb_frontend_detach(chan->fe);
+                chan->fe = NULL;
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
+static void cineS2_tuner_i2c_lock(struct dvb_frontend *fe, int lock)
+{
+        struct ngene_channel *chan = fe->analog_demod_priv;
+
+        if (lock)
+                down(&chan->dev->pll_mutex);
+        else
+                up(&chan->dev->pll_mutex);
+}
+
+static int cineS2_probe(struct ngene_channel *chan)
+{
+        struct i2c_adapter *i2c;
+        struct stv090x_config *fe_conf;
+        u8 buf[3];
+        struct i2c_msg i2c_msg = { .flags = 0, .buf = buf };
+        int rc;
+
+        /* tuner 1+2: i2c adapter #0, tuner 3+4: i2c adapter #1 */
+        if (chan->number < 2)
+                i2c = &chan->dev->channel[0].i2c_adapter;
+        else
+                i2c = &chan->dev->channel[1].i2c_adapter;
+
+        fe_conf = chan->dev->card_info->fe_config[chan->number];
+        i2c_msg.addr = fe_conf->address;
+
+        /* probe demod */
+        i2c_msg.len = 2;
+        buf[0] = 0xf1;
+        buf[1] = 0x00;
+        rc = i2c_transfer(i2c, &i2c_msg, 1);
+        if (rc != 1)
+                return -ENODEV;
+
+        /* demod found, attach it */
+        rc = demod_attach_stv0900(chan);
+        if (rc < 0 || chan->number < 2)
+                return rc;
+
+        /* demod #2: reprogram outputs DPN1 & DPN2 */
+        i2c_msg.len = 3;
+        buf[0] = 0xf1;
+        switch (chan->number) {
+        case 2:
+                buf[1] = 0x5c;
+                buf[2] = 0xc2;
+                break;
+        case 3:
+                buf[1] = 0x61;
+                buf[2] = 0xcc;
+                break;
+        default:
                 return -ENODEV;
         }
+        rc = i2c_transfer(i2c, &i2c_msg, 1);
+        if (rc != 1) {
+                printk(KERN_ERR DEVICE_NAME ": could not setup DPNx\n");
+                return -EIO;
+        }
 
         return 0;
 }
 
+
 static struct lgdt330x_config aver_m780 = {
         .demod_address = 0xb2 >> 1,
         .demod_chip    = LGDT3303,
@@ -151,6 +235,29 @@ static struct stv090x_config fe_cineS2 = {
         .adc2_range     = STV090x_ADC_1Vpp,
 
         .diseqc_envelope_mode = true,
+
+        .tuner_i2c_lock = cineS2_tuner_i2c_lock,
+};
+
+static struct stv090x_config fe_cineS2_2 = {
+        .device         = STV0900,
+        .demod_mode     = STV090x_DUAL,
+        .clk_mode       = STV090x_CLK_EXT,
+
+        .xtal           = 27000000,
+        .address        = 0x69,
+
+        .ts1_mode       = STV090x_TSMODE_SERIAL_PUNCTURED,
+        .ts2_mode       = STV090x_TSMODE_SERIAL_PUNCTURED,
+
+        .repeater_level = STV090x_RPTLEVEL_16,
+
+        .adc1_range     = STV090x_ADC_1Vpp,
+        .adc2_range     = STV090x_ADC_1Vpp,
+
+        .diseqc_envelope_mode = true,
+
+        .tuner_i2c_lock = cineS2_tuner_i2c_lock,
 };
 
 static struct stv6110x_config tuner_cineS2_0 = {
@@ -175,7 +282,8 @@ static struct ngene_info ngene_info_cineS2 = {
         .tuner_config   = {&tuner_cineS2_0, &tuner_cineS2_1},
         .lnb            = {0x0b, 0x08},
         .tsf            = {3, 3},
-        .fw_version     = 15,
+        .fw_version     = 18,
+        .msi_supported  = true,
 };
 
 static struct ngene_info ngene_info_satixS2 = {
@@ -188,46 +296,54 @@ static struct ngene_info ngene_info_satixS2 = {
         .tuner_config   = {&tuner_cineS2_0, &tuner_cineS2_1},
         .lnb            = {0x0b, 0x08},
         .tsf            = {3, 3},
-        .fw_version     = 15,
+        .fw_version     = 18,
+        .msi_supported  = true,
 };
 
 static struct ngene_info ngene_info_satixS2v2 = {
         .type           = NGENE_SIDEWINDER,
         .name           = "Mystique SaTiX-S2 Dual (v2)",
-        .io_type        = {NGENE_IO_TSIN, NGENE_IO_TSIN},
-        .demod_attach   = {demod_attach_stv0900, demod_attach_stv0900},
-        .tuner_attach   = {tuner_attach_stv6110, tuner_attach_stv6110},
-        .fe_config      = {&fe_cineS2, &fe_cineS2},
-        .tuner_config   = {&tuner_cineS2_0, &tuner_cineS2_1},
-        .lnb            = {0x0a, 0x08},
+        .io_type        = {NGENE_IO_TSIN, NGENE_IO_TSIN, NGENE_IO_TSIN, NGENE_IO_TSIN,
+                           NGENE_IO_TSOUT},
+        .demod_attach   = {demod_attach_stv0900, demod_attach_stv0900, cineS2_probe, cineS2_probe},
+        .tuner_attach   = {tuner_attach_stv6110, tuner_attach_stv6110, tuner_attach_stv6110, tuner_attach_stv6110},
+        .fe_config      = {&fe_cineS2, &fe_cineS2, &fe_cineS2_2, &fe_cineS2_2},
+        .tuner_config   = {&tuner_cineS2_0, &tuner_cineS2_1, &tuner_cineS2_0, &tuner_cineS2_1},
+        .lnb            = {0x0a, 0x08, 0x0b, 0x09},
         .tsf            = {3, 3},
-        .fw_version     = 15,
+        .fw_version     = 18,
+        .msi_supported  = true,
 };
 
 static struct ngene_info ngene_info_cineS2v5 = {
         .type           = NGENE_SIDEWINDER,
         .name           = "Linux4Media cineS2 DVB-S2 Twin Tuner (v5)",
-        .io_type        = {NGENE_IO_TSIN, NGENE_IO_TSIN},
-        .demod_attach   = {demod_attach_stv0900, demod_attach_stv0900},
-        .tuner_attach   = {tuner_attach_stv6110, tuner_attach_stv6110},
-        .fe_config      = {&fe_cineS2, &fe_cineS2},
-        .tuner_config   = {&tuner_cineS2_0, &tuner_cineS2_1},
-        .lnb            = {0x0a, 0x08},
+        .io_type        = {NGENE_IO_TSIN, NGENE_IO_TSIN, NGENE_IO_TSIN, NGENE_IO_TSIN,
+                           NGENE_IO_TSOUT},
+        .demod_attach   = {demod_attach_stv0900, demod_attach_stv0900, cineS2_probe, cineS2_probe},
+        .tuner_attach   = {tuner_attach_stv6110, tuner_attach_stv6110, tuner_attach_stv6110, tuner_attach_stv6110},
+        .fe_config      = {&fe_cineS2, &fe_cineS2, &fe_cineS2_2, &fe_cineS2_2},
+        .tuner_config   = {&tuner_cineS2_0, &tuner_cineS2_1, &tuner_cineS2_0, &tuner_cineS2_1},
+        .lnb            = {0x0a, 0x08, 0x0b, 0x09},
         .tsf            = {3, 3},
-        .fw_version     = 15,
+        .fw_version     = 18,
+        .msi_supported  = true,
 };
 
+
 static struct ngene_info ngene_info_duoFlexS2 = {
         .type           = NGENE_SIDEWINDER,
         .name           = "Digital Devices DuoFlex S2 miniPCIe",
-        .io_type        = {NGENE_IO_TSIN, NGENE_IO_TSIN},
-        .demod_attach   = {demod_attach_stv0900, demod_attach_stv0900},
-        .tuner_attach   = {tuner_attach_stv6110, tuner_attach_stv6110},
-        .fe_config      = {&fe_cineS2, &fe_cineS2},
-        .tuner_config   = {&tuner_cineS2_0, &tuner_cineS2_1},
-        .lnb            = {0x0a, 0x08},
+        .io_type        = {NGENE_IO_TSIN, NGENE_IO_TSIN, NGENE_IO_TSIN, NGENE_IO_TSIN,
+                           NGENE_IO_TSOUT},
+        .demod_attach   = {cineS2_probe, cineS2_probe, cineS2_probe, cineS2_probe},
+        .tuner_attach   = {tuner_attach_stv6110, tuner_attach_stv6110, tuner_attach_stv6110, tuner_attach_stv6110},
+        .fe_config      = {&fe_cineS2, &fe_cineS2, &fe_cineS2_2, &fe_cineS2_2},
+        .tuner_config   = {&tuner_cineS2_0, &tuner_cineS2_1, &tuner_cineS2_0, &tuner_cineS2_1},
+        .lnb            = {0x0a, 0x08, 0x0b, 0x09},
         .tsf            = {3, 3},
-        .fw_version     = 15,
+        .fw_version     = 18,
+        .msi_supported  = true,
 };
 
 static struct ngene_info ngene_info_m780 = {
@@ -321,6 +437,7 @@ static struct pci_driver ngene_pci_driver = {
         .probe       = ngene_probe,
         .remove      = __devexit_p(ngene_remove),
         .err_handler = &ngene_errors,
+        .shutdown    = ngene_shutdown,
 };
 
 static __init int module_init_ngene(void)
diff --git a/drivers/media/dvb/ngene/ngene-core.c b/drivers/media/dvb/ngene/ngene-core.c
index 4caeb163a666..6927c726ce35 100644
--- a/drivers/media/dvb/ngene/ngene-core.c
+++ b/drivers/media/dvb/ngene/ngene-core.c
@@ -34,7 +34,6 @@
 #include <linux/io.h>
 #include <asm/div64.h>
 #include <linux/pci.h>
-#include <linux/smp_lock.h>
 #include <linux/timer.h>
 #include <linux/byteorder/generic.h>
 #include <linux/firmware.h>
@@ -46,6 +45,9 @@ static int one_adapter = 1;
 module_param(one_adapter, int, 0444);
 MODULE_PARM_DESC(one_adapter, "Use only one adapter.");
 
+static int shutdown_workaround;
+module_param(shutdown_workaround, int, 0644);
+MODULE_PARM_DESC(shutdown_workaround, "Activate workaround for shutdown problem with some chipsets.");
 
 static int debug;
 module_param(debug, int, 0444);
@@ -120,7 +122,7 @@ static void demux_tasklet(unsigned long data)
                                                 Cur->ngeneBuffer.SR.Flags &=
                                                         ~0x40;
                                                 break;
-                                                /* Stop proccessing stream */
+                                                /* Stop processing stream */
                                         }
                                 } else {
                                         /* We got a valid buffer,
@@ -131,7 +133,7 @@ static void demux_tasklet(unsigned long data)
                                 printk(KERN_ERR DEVICE_NAME ": OOPS\n");
                                 if (chan->HWState == HWSTATE_RUN) {
                                         Cur->ngeneBuffer.SR.Flags &= ~0x40;
-                                        break;  /* Stop proccessing stream */
+                                        break;  /* Stop processing stream */
                                 }
                         }
                         if (chan->AudioDTOUpdated) {
@@ -144,7 +146,7 @@ static void demux_tasklet(unsigned long data)
                         }
                 } else {
                         if (chan->HWState == HWSTATE_RUN) {
-                                u32 Flags = 0;
+                                u32 Flags = chan->DataFormatFlags;
                                 IBufferExchange *exch1 = chan->pBufferExchange;
                                 IBufferExchange *exch2 = chan->pBufferExchange2;
                                 if (Cur->ngeneBuffer.SR.Flags & 0x01)
@@ -475,9 +477,9 @@ static u8 SPDIFConfiguration[10] = {
 
 /* Set NGENE I2S Config to transport stream compatible mode */
 
-static u8 TS_I2SConfiguration[4] = { 0x3E, 0x1A, 0x00, 0x00 }; /*3e 18 00 00 ?*/
+static u8 TS_I2SConfiguration[4] = { 0x3E, 0x18, 0x00, 0x00 };
 
-static u8 TS_I2SOutConfiguration[4] = { 0x80, 0x20, 0x00, 0x00 };
+static u8 TS_I2SOutConfiguration[4] = { 0x80, 0x04, 0x00, 0x00 };
 
 static u8 ITUDecoderSetup[4][16] = {
         {0x1c, 0x13, 0x01, 0x68, 0x3d, 0x90, 0x14, 0x20,  /* SDTV */
@@ -750,13 +752,11 @@ void set_transfer(struct ngene_channel *chan, int state)
                 if (chan->mode & NGENE_IO_TSOUT) {
                         chan->pBufferExchange = tsout_exchange;
                         /* 0x66666666 = 50MHz *2^33 /250MHz */
-                        chan->AudioDTOValue = 0x66666666;
-                        /* set_dto(chan, 38810700+1000); */
-                        /* set_dto(chan, 19392658); */
+                        chan->AudioDTOValue = 0x80000000;
+                        chan->AudioDTOUpdated = 1;
                 }
                 if (chan->mode & NGENE_IO_TSIN)
                         chan->pBufferExchange = tsin_exchange;
-                /* ngwritel(0, 0x9310); */
                 spin_unlock_irq(&chan->state_lock);
         } else
                 ;/* printk(KERN_INFO DEVICE_NAME ": lock=%08x\n",
@@ -1169,6 +1169,7 @@ static void ngene_release_buffers(struct ngene *dev)
                 iounmap(dev->iomem);
         free_common_buffers(dev);
         vfree(dev->tsout_buf);
+        vfree(dev->tsin_buf);
         vfree(dev->ain_buf);
         vfree(dev->vin_buf);
         vfree(dev);
@@ -1185,6 +1186,13 @@ static int ngene_get_buffers(struct ngene *dev)
                 dvb_ringbuffer_init(&dev->tsout_rbuf,
                                     dev->tsout_buf, TSOUT_BUF_SIZE);
         }
+        if (dev->card_info->io_type[2]&NGENE_IO_TSIN) {
+                dev->tsin_buf = vmalloc(TSIN_BUF_SIZE);
+                if (!dev->tsin_buf)
+                        return -ENOMEM;
+                dvb_ringbuffer_init(&dev->tsin_rbuf,
+                                    dev->tsin_buf, TSIN_BUF_SIZE);
+        }
         if (dev->card_info->io_type[2] & NGENE_IO_AIN) {
                 dev->ain_buf = vmalloc(AIN_BUF_SIZE);
                 if (!dev->ain_buf)
@@ -1258,6 +1266,10 @@ static int ngene_load_firm(struct ngene *dev)
                 fw_name = "ngene_17.fw";
                 dev->cmd_timeout_workaround = true;
                 break;
+        case 18:
+                size = 0;
+                fw_name = "ngene_18.fw";
+                break;
         }
 
         if (request_firmware(&fw, fw_name, &dev->pci_dev->dev) < 0) {
@@ -1267,6 +1279,8 @@ static int ngene_load_firm(struct ngene *dev)
                         ": Copy %s to your hotplug directory!\n", fw_name);
                 return -1;
         }
+        if (size == 0)
+                size = fw->size;
         if (size != fw->size) {
                 printk(KERN_ERR DEVICE_NAME
                         ": Firmware %s has invalid size!", fw_name);
@@ -1302,10 +1316,38 @@ static void ngene_stop(struct ngene *dev)
 #endif
 }
 
+static int ngene_buffer_config(struct ngene *dev)
+{
+        int stat;
+
+        if (dev->card_info->fw_version >= 17) {
+                u8 tsin12_config[6]   = { 0x60, 0x60, 0x00, 0x00, 0x00, 0x00 };
+                u8 tsin1234_config[6] = { 0x30, 0x30, 0x00, 0x30, 0x30, 0x00 };
+                u8 tsio1235_config[6] = { 0x30, 0x30, 0x00, 0x28, 0x00, 0x38 };
+                u8 *bconf = tsin12_config;
+
+                if (dev->card_info->io_type[2]&NGENE_IO_TSIN &&
+                    dev->card_info->io_type[3]&NGENE_IO_TSIN) {
+                        bconf = tsin1234_config;
+                        if (dev->card_info->io_type[4]&NGENE_IO_TSOUT &&
+                            dev->ci.en)
+                                bconf = tsio1235_config;
+                }
+                stat = ngene_command_config_free_buf(dev, bconf);
+        } else {
+                int bconf = BUFFER_CONFIG_4422;
+
+                if (dev->card_info->io_type[3] == NGENE_IO_TSIN)
+                        bconf = BUFFER_CONFIG_3333;
+                stat = ngene_command_config_buf(dev, bconf);
+        }
+        return stat;
+}
+
+
 static int ngene_start(struct ngene *dev)
 {
         int stat;
-        unsigned long flags;
         int i;
 
         pci_set_master(dev->pci_dev);
@@ -1338,6 +1380,8 @@ static int ngene_start(struct ngene *dev)
 #ifdef CONFIG_PCI_MSI
         /* enable MSI if kernel and card support it */
         if (pci_msi_enabled() && dev->card_info->msi_supported) {
+                unsigned long flags;
+
                 ngwritel(0, NGENE_INT_ENABLE);
                 free_irq(dev->pci_dev->irq, dev);
                 stat = pci_enable_msi(dev->pci_dev);
@@ -1365,23 +1409,6 @@ static int ngene_start(struct ngene *dev)
         if (stat < 0)
                 goto fail;
 
-        if (dev->card_info->fw_version == 17) {
-                u8 tsin4_config[6] = {
-                        3072 / 64, 3072 / 64, 0, 3072 / 64, 3072 / 64, 0};
-                u8 default_config[6] = {
-                        4096 / 64, 4096 / 64, 0, 2048 / 64, 2048 / 64, 0};
-                u8 *bconf = default_config;
-
-                if (dev->card_info->io_type[3] == NGENE_IO_TSIN)
-                        bconf = tsin4_config;
-                dprintk(KERN_DEBUG DEVICE_NAME ": FW 17 buffer config\n");
-                stat = ngene_command_config_free_buf(dev, bconf);
-        } else {
-                int bconf = BUFFER_CONFIG_4422;
-                if (dev->card_info->io_type[3] == NGENE_IO_TSIN)
-                        bconf = BUFFER_CONFIG_3333;
-                stat = ngene_command_config_buf(dev, bconf);
-        }
         if (!stat)
                 return stat;
 
@@ -1397,9 +1424,6 @@ fail2:
         return stat;
 }
 
-
-
-
 /****************************************************************************/
 /****************************************************************************/
 /****************************************************************************/
@@ -1408,20 +1432,25 @@ static void release_channel(struct ngene_channel *chan)
 {
         struct dvb_demux *dvbdemux = &chan->demux;
         struct ngene *dev = chan->dev;
-        struct ngene_info *ni = dev->card_info;
-        int io = ni->io_type[chan->number];
 
-        if (chan->dev->cmd_timeout_workaround && chan->running)
+        if (chan->running)
                 set_transfer(chan, 0);
 
         tasklet_kill(&chan->demux_tasklet);
 
-        if (io & (NGENE_IO_TSIN | NGENE_IO_TSOUT)) {
-                if (chan->fe) {
-                        dvb_unregister_frontend(chan->fe);
-                        dvb_frontend_detach(chan->fe);
-                        chan->fe = NULL;
-                }
+        if (chan->ci_dev) {
+                dvb_unregister_device(chan->ci_dev);
+                chan->ci_dev = NULL;
+        }
+
+        if (chan->fe) {
+                dvb_unregister_frontend(chan->fe);
+                dvb_frontend_detach(chan->fe);
+                chan->fe = NULL;
+        }
+
+        if (chan->has_demux) {
+                dvb_net_release(&chan->dvbnet);
                 dvbdemux->dmx.close(&dvbdemux->dmx);
                 dvbdemux->dmx.remove_frontend(&dvbdemux->dmx,
                                               &chan->hw_frontend);
@@ -1429,9 +1458,12 @@ static void release_channel(struct ngene_channel *chan)
                                               &chan->mem_frontend);
                 dvb_dmxdev_release(&chan->dmxdev);
                 dvb_dmx_release(&chan->demux);
+                chan->has_demux = false;
+        }
 
-                if (chan->number == 0 || !one_adapter)
-                        dvb_unregister_adapter(&dev->adapter[chan->number]);
+        if (chan->has_adapter) {
+                dvb_unregister_adapter(&dev->adapter[chan->number]);
+                chan->has_adapter = false;
         }
 }
 
@@ -1449,9 +1481,27 @@ static int init_channel(struct ngene_channel *chan)
         chan->type = io;
         chan->mode = chan->type;        /* for now only one mode */
 
+        if (io & NGENE_IO_TSIN) {
+                chan->fe = NULL;
+                if (ni->demod_attach[nr]) {
+                        ret = ni->demod_attach[nr](chan);
+                        if (ret < 0)
+                                goto err;
+                }
+                if (chan->fe && ni->tuner_attach[nr]) {
+                        ret = ni->tuner_attach[nr](chan);
+                        if (ret < 0)
+                                goto err;
+                }
+        }
+
+        if (!dev->ci.en && (io & NGENE_IO_TSOUT))
+                return 0;
+
         if (io & (NGENE_IO_TSIN | NGENE_IO_TSOUT)) {
                 if (nr >= STREAM_AUDIOIN1)
                         chan->DataFormatFlags = DF_SWAP32;
+
                 if (nr == 0 || !one_adapter || dev->first_adapter == NULL) {
                         adapter = &dev->adapter[nr];
                         ret = dvb_register_adapter(adapter, "nGene",
@@ -1459,40 +1509,51 @@ static int init_channel(struct ngene_channel *chan)
                                                    &chan->dev->pci_dev->dev,
                                                    adapter_nr);
                         if (ret < 0)
-                                return ret;
+                                goto err;
                         if (dev->first_adapter == NULL)
                                 dev->first_adapter = adapter;
-                } else {
+                        chan->has_adapter = true;
+                } else
                         adapter = dev->first_adapter;
-                }
+        }
+
+        if (dev->ci.en && (io & NGENE_IO_TSOUT)) {
+                dvb_ca_en50221_init(adapter, dev->ci.en, 0, 1);
+                set_transfer(chan, 1);
+                chan->dev->channel[2].DataFormatFlags = DF_SWAP32;
+                set_transfer(&chan->dev->channel[2], 1);
+                dvb_register_device(adapter, &chan->ci_dev,
+                                    &ngene_dvbdev_ci, (void *) chan,
+                                    DVB_DEVICE_SEC);
+                if (!chan->ci_dev)
+                        goto err;
+        }
 
+        if (chan->fe) {
+                if (dvb_register_frontend(adapter, chan->fe) < 0)
+                        goto err;
+                chan->has_demux = true;
+        }
+
+        if (chan->has_demux) {
                 ret = my_dvb_dmx_ts_card_init(dvbdemux, "SW demux",
                                               ngene_start_feed,
                                               ngene_stop_feed, chan);
                 ret = my_dvb_dmxdev_ts_card_init(&chan->dmxdev, &chan->demux,
                                                  &chan->hw_frontend,
                                                  &chan->mem_frontend, adapter);
+                ret = dvb_net_init(adapter, &chan->dvbnet, &chan->demux.dmx);
         }
 
-        if (io & NGENE_IO_TSIN) {
+        return ret;
+
+err:
+        if (chan->fe) {
+                dvb_frontend_detach(chan->fe);
                 chan->fe = NULL;
-                if (ni->demod_attach[nr])
-                        ni->demod_attach[nr](chan);
-                if (chan->fe) {
-                        if (dvb_register_frontend(adapter, chan->fe) < 0) {
-                                if (chan->fe->ops.release)
-                                        chan->fe->ops.release(chan->fe);
-                                chan->fe = NULL;
-                        }
-                }
-                if (chan->fe && ni->tuner_attach[nr])
-                        if (ni->tuner_attach[nr] (chan) < 0) {
-                                printk(KERN_ERR DEVICE_NAME
-                                       ": Tuner attach failed on channel %d!\n",
-                                       nr);
-                        }
         }
-        return ret;
+        release_channel(chan);
+        return 0;
 }
 
 static int init_channels(struct ngene *dev)
@@ -1510,18 +1571,71 @@ static int init_channels(struct ngene *dev)
         return 0;
 }
 
+static void cxd_attach(struct ngene *dev)
+{
+        struct ngene_ci *ci = &dev->ci;
+
+        ci->en = cxd2099_attach(0x40, dev, &dev->channel[0].i2c_adapter);
+        ci->dev = dev;
+        return;
+}
+
+static void cxd_detach(struct ngene *dev)
+{
+        struct ngene_ci *ci = &dev->ci;
+
+        dvb_ca_en50221_release(ci->en);
+        kfree(ci->en);
+        ci->en = 0;
+}
+
+/***********************************/
+/* workaround for shutdown failure */
+/***********************************/
+
+static void ngene_unlink(struct ngene *dev)
+{
+        struct ngene_command com;
+
+        com.cmd.hdr.Opcode = CMD_MEM_WRITE;
+        com.cmd.hdr.Length = 3;
+        com.cmd.MemoryWrite.address = 0x910c;
+        com.cmd.MemoryWrite.data = 0xff;
+        com.in_len = 3;
+        com.out_len = 1;
+
+        down(&dev->cmd_mutex);
+        ngwritel(0, NGENE_INT_ENABLE);
+        ngene_command_mutex(dev, &com);
+        up(&dev->cmd_mutex);
+}
+
+void ngene_shutdown(struct pci_dev *pdev)
+{
+        struct ngene *dev = (struct ngene *)pci_get_drvdata(pdev);
+
+        if (!dev || !shutdown_workaround)
+                return;
+
+        printk(KERN_INFO DEVICE_NAME ": shutdown workaround...\n");
+        ngene_unlink(dev);
+        pci_disable_device(pdev);
+}
+
 /****************************************************************************/
 /* device probe/remove calls ************************************************/
 /****************************************************************************/
 
 void __devexit ngene_remove(struct pci_dev *pdev)
 {
-        struct ngene *dev = (struct ngene *)pci_get_drvdata(pdev);
+        struct ngene *dev = pci_get_drvdata(pdev);
         int i;
 
         tasklet_kill(&dev->event_tasklet);
         for (i = MAX_STREAM - 1; i >= 0; i--)
                 release_channel(&dev->channel[i]);
+        if (dev->ci.en)
+                cxd_detach(dev);
         ngene_stop(dev);
         ngene_release_buffers(dev);
         pci_set_drvdata(pdev, NULL);
@@ -1537,12 +1651,11 @@ int __devinit ngene_probe(struct pci_dev *pci_dev,
         if (pci_enable_device(pci_dev) < 0)
                 return -ENODEV;
 
-        dev = vmalloc(sizeof(struct ngene));
+        dev = vzalloc(sizeof(struct ngene));
         if (dev == NULL) {
                 stat = -ENOMEM;
                 goto fail0;
         }
-        memset(dev, 0, sizeof(struct ngene));
 
         dev->pci_dev = pci_dev;
         dev->card_info = (struct ngene_info *)id->driver_data;
@@ -1558,6 +1671,13 @@ int __devinit ngene_probe(struct pci_dev *pci_dev,
         if (stat < 0)
                 goto fail1;
 
+        cxd_attach(dev);
+
+        stat = ngene_buffer_config(dev);
+        if (stat < 0)
+                goto fail1;
+
+
         dev->i2c_current_bus = -1;
 
         /* Register DVB adapters and devices for both channels */
diff --git a/drivers/media/dvb/ngene/ngene-dvb.c b/drivers/media/dvb/ngene/ngene-dvb.c
index 48f980b21d66..0b4943233166 100644
--- a/drivers/media/dvb/ngene/ngene-dvb.c
+++ b/drivers/media/dvb/ngene/ngene-dvb.c
@@ -35,7 +35,6 @@
 #include <linux/io.h>
 #include <asm/div64.h>
 #include <linux/pci.h>
-#include <linux/smp_lock.h>
 #include <linux/timer.h>
 #include <linux/byteorder/generic.h>
 #include <linux/firmware.h>
@@ -48,6 +47,64 @@
 /* COMMAND API interface ****************************************************/
 /****************************************************************************/
 
+static ssize_t ts_write(struct file *file, const char *buf,
+                        size_t count, loff_t *ppos)
+{
+        struct dvb_device *dvbdev = file->private_data;
+        struct ngene_channel *chan = dvbdev->priv;
+        struct ngene *dev = chan->dev;
+
+        if (wait_event_interruptible(dev->tsout_rbuf.queue,
+                                     dvb_ringbuffer_free
+                                     (&dev->tsout_rbuf) >= count) < 0)
+                return 0;
+
+        dvb_ringbuffer_write(&dev->tsout_rbuf, buf, count);
+
+        return count;
+}
+
+static ssize_t ts_read(struct file *file, char *buf,
+                       size_t count, loff_t *ppos)
+{
+        struct dvb_device *dvbdev = file->private_data;
+        struct ngene_channel *chan = dvbdev->priv;
+        struct ngene *dev = chan->dev;
+        int left, avail;
+
+        left = count;
+        while (left) {
+                if (wait_event_interruptible(
+                            dev->tsin_rbuf.queue,
+                            dvb_ringbuffer_avail(&dev->tsin_rbuf) > 0) < 0)
+                        return -EAGAIN;
+                avail = dvb_ringbuffer_avail(&dev->tsin_rbuf);
+                if (avail > left)
+                        avail = left;
+                dvb_ringbuffer_read_user(&dev->tsin_rbuf, buf, avail);
+                left -= avail;
+                buf += avail;
+        }
+        return count;
+}
+
+static const struct file_operations ci_fops = {
+        .owner   = THIS_MODULE,
+        .read    = ts_read,
+        .write   = ts_write,
+        .open    = dvb_generic_open,
+        .release = dvb_generic_release,
+};
+
+struct dvb_device ngene_dvbdev_ci = {
+        .priv    = 0,
+        .readers = -1,
+        .writers = -1,
+        .users   = -1,
+        .fops    = &ci_fops,
+};
+
+
 /****************************************************************************/
 /* DVB functions and API interface ******************************************/
 /****************************************************************************/
@@ -64,10 +121,21 @@ static void swap_buffer(u32 *p, u32 len)
 void *tsin_exchange(void *priv, void *buf, u32 len, u32 clock, u32 flags)
 {
         struct ngene_channel *chan = priv;
+        struct ngene *dev = chan->dev;
 
 
-        if (chan->users > 0)
+        if (flags & DF_SWAP32)
+                swap_buffer(buf, len);
+        if (dev->ci.en && chan->number == 2) {
+                if (dvb_ringbuffer_free(&dev->tsin_rbuf) > len) {
+                        dvb_ringbuffer_write(&dev->tsin_rbuf, buf, len);
+                        wake_up_interruptible(&dev->tsin_rbuf.queue);
+                }
+                return 0;
+        }
+        if (chan->users > 0) {
                 dvb_dmx_swfilter(&chan->demux, buf, len);
+        }
         return NULL;
 }
 
diff --git a/drivers/media/dvb/ngene/ngene-i2c.c b/drivers/media/dvb/ngene/ngene-i2c.c
index 477fe0aade86..d28554f8ce99 100644
--- a/drivers/media/dvb/ngene/ngene-i2c.c
+++ b/drivers/media/dvb/ngene/ngene-i2c.c
@@ -37,7 +37,6 @@
 #include <asm/div64.h>
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
-#include <linux/smp_lock.h>
 #include <linux/timer.h>
 #include <linux/byteorder/generic.h>
 #include <linux/firmware.h>
@@ -165,7 +164,6 @@ int ngene_i2c_init(struct ngene *dev, int dev_nr)
         struct i2c_adapter *adap = &(dev->channel[dev_nr].i2c_adapter);
 
         i2c_set_adapdata(adap, &(dev->channel[dev_nr]));
-        adap->class = I2C_CLASS_TV_DIGITAL | I2C_CLASS_TV_ANALOG;
 
         strcpy(adap->name, "nGene");
 
diff --git a/drivers/media/dvb/ngene/ngene.h b/drivers/media/dvb/ngene/ngene.h
index 8fb4200f83f8..40fce9e3ae66 100644
--- a/drivers/media/dvb/ngene/ngene.h
+++ b/drivers/media/dvb/ngene/ngene.h
@@ -36,8 +36,11 @@
 #include "dmxdev.h"
 #include "dvbdev.h"
 #include "dvb_demux.h"
+#include "dvb_ca_en50221.h"
 #include "dvb_frontend.h"
 #include "dvb_ringbuffer.h"
+#include "dvb_net.h"
+#include "cxd2099.h"
 
 #define DEVICE_NAME "ngene"
 
@@ -636,14 +639,18 @@ struct ngene_channel {
         int                   number;
         int                   type;
         int                   mode;
+        bool                  has_adapter;
+        bool                  has_demux;
 
         struct dvb_frontend  *fe;
         struct dmxdev         dmxdev;
         struct dvb_demux      demux;
+        struct dvb_net        dvbnet;
         struct dmx_frontend   hw_frontend;
         struct dmx_frontend   mem_frontend;
         int                   users;
         struct video_device  *v4l_dev;
+        struct dvb_device    *ci_dev;
         struct tasklet_struct demux_tasklet;
 
         struct SBufferHeader *nextBuffer;
@@ -710,6 +717,15 @@ struct ngene_channel {
         int running;
 };
 
+
+struct ngene_ci {
+        struct device         device;
+        struct i2c_adapter    i2c_adapter;
+
+        struct ngene         *dev;
+        struct dvb_ca_en50221 *en;
+};
+
 struct ngene;
 
 typedef void (rx_cb_t)(struct ngene *, u32, u8);
@@ -774,6 +790,10 @@ struct ngene {
 #define TSOUT_BUF_SIZE (512*188*8)
         struct dvb_ringbuffer tsout_rbuf;
 
+        u8                   *tsin_buf;
+#define TSIN_BUF_SIZE (512*188*8)
+        struct dvb_ringbuffer tsin_rbuf;
+
         u8                   *ain_buf;
 #define AIN_BUF_SIZE (128*1024)
         struct dvb_ringbuffer ain_rbuf;
@@ -785,6 +805,8 @@ struct ngene {
 
         unsigned long         exp_val;
         int prev_cmd;
+
+        struct ngene_ci       ci;
 };
 
 struct ngene_info {
@@ -863,6 +885,7 @@ struct ngene_buffer {
 int __devinit ngene_probe(struct pci_dev *pci_dev,
                           const struct pci_device_id *id);
 void __devexit ngene_remove(struct pci_dev *pdev);
+void ngene_shutdown(struct pci_dev *pdev);
 int ngene_command(struct ngene *dev, struct ngene_command *com);
 int ngene_command_gpio_set(struct ngene *dev, u8 select, u8 level);
 void set_transfer(struct ngene_channel *chan, int state);
@@ -872,6 +895,7 @@ void FillTSBuffer(void *Buffer, int Length, u32 Flags);
 int ngene_i2c_init(struct ngene *dev, int dev_nr);
 
 /* Provided by ngene-dvb.c */
+extern struct dvb_device ngene_dvbdev_ci;
 void *tsout_exchange(void *priv, void *buf, u32 len, u32 clock, u32 flags);
 void *tsin_exchange(void *priv, void *buf, u32 len, u32 clock, u32 flags);
 int ngene_start_feed(struct dvb_demux_feed *dvbdmxfeed);