6 files changed, 117 insertions, 12 deletions

diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
index 49952980dab3..c7e5851d3486 100644
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
@@ -61,6 +61,8 @@ config VIDEO_CX88_DVB
         select DVB_STV0299 if !DVB_FE_CUSTOMISE
         select DVB_STV0288 if !DVB_FE_CUSTOMISE
         select DVB_STB6000 if !DVB_FE_CUSTOMISE
+        select DVB_STV0900 if !DVB_FE_CUSTOMISE
+        select DVB_STB6100 if !DVB_FE_CUSTOMISE
         select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE
         ---help---
           This adds support for DVB/ATSC cards based on the
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 33be6369871a..d844f2aaa01d 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -2075,6 +2075,18 @@ static const struct cx88_board cx88_boards[] = {
                 },
                 .mpeg           = CX88_MPEG_DVB,
         },
+        [CX88_BOARD_PROF_7301] = {
+                .name           = "Prof 7301 DVB-S/S2",
+                .tuner_type     = UNSET,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .input          = { {
+                        .type   = CX88_VMUX_DVB,
+                        .vmux   = 0,
+                } },
+                .mpeg           = CX88_MPEG_DVB,
+        },
 };
 
 /* ------------------------------------------------------------------ */
@@ -2535,6 +2547,10 @@ static const struct cx88_subid cx88_subids[] = {
                 .subvendor = 0x107d,
                 .subdevice = 0x6618,
                 .card      = CX88_BOARD_WINFAST_TV2000_XP_GLOBAL,
+        }, {
+                .subvendor = 0xb034,
+                .subdevice = 0x3034,
+                .card      = CX88_BOARD_PROF_7301,
         },
 };
 
@@ -3211,6 +3227,7 @@ static void cx88_card_setup(struct cx88_core *core)
         case  CX88_BOARD_TBS_8920:
         case  CX88_BOARD_PROF_6200:
         case  CX88_BOARD_PROF_7300:
+        case  CX88_BOARD_PROF_7301:
         case  CX88_BOARD_SATTRADE_ST4200:
                 cx_write(MO_GP0_IO, 0x8000);
                 msleep(100);
@@ -3267,7 +3284,7 @@ static void cx88_card_setup(struct cx88_core *core)
                             ctl.fname);
                 call_all(core, tuner, s_config, &xc2028_cfg);
         }
-        call_all(core, tuner, s_standby);
+        call_all(core, core, s_power, 0);
 }
 
 /* ------------------------------------------------------------------ */
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 518bcfe18bcb..b14296923250 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -53,6 +53,9 @@
 #include "stv0288.h"
 #include "stb6000.h"
 #include "cx24116.h"
+#include "stv0900.h"
+#include "stb6100.h"
+#include "stb6100_proc.h"
 
 MODULE_DESCRIPTION("driver for cx2388x based DVB cards");
 MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>");
@@ -573,6 +576,15 @@ static int cx24116_set_ts_param(struct dvb_frontend *fe,
         return 0;
 }
 
+static int stv0900_set_ts_param(struct dvb_frontend *fe,
+        int is_punctured)
+{
+        struct cx8802_dev *dev = fe->dvb->priv;
+        dev->ts_gen_cntrl = 0;
+
+        return 0;
+}
+
 static int cx24116_reset_device(struct dvb_frontend *fe)
 {
         struct cx8802_dev *dev = fe->dvb->priv;
@@ -601,6 +613,23 @@ static struct cx24116_config tevii_s460_config = {
         .reset_device  = cx24116_reset_device,
 };
 
+static struct stv0900_config prof_7301_stv0900_config = {
+        .demod_address = 0x6a,
+/*      demod_mode = 0,*/
+        .xtal = 27000000,
+        .clkmode = 3,/* 0-CLKI, 2-XTALI, else AUTO */
+        .diseqc_mode = 2,/* 2/3 PWM */
+        .tun1_maddress = 0,/* 0x60 */
+        .tun1_adc = 0,/* 2 Vpp */
+        .path1_mode = 3,
+        .set_ts_params = stv0900_set_ts_param,
+};
+
+static struct stb6100_config prof_7301_stb6100_config = {
+        .tuner_address = 0x60,
+        .refclock = 27000000,
+};
+
 static struct stv0299_config tevii_tuner_sharp_config = {
         .demod_address = 0x68,
         .inittab = sharp_z0194a_inittab,
@@ -1149,6 +1178,31 @@ static int dvb_register(struct cx8802_dev *dev)
                                 goto frontend_detach;
                 }
                 break;
+        case CX88_BOARD_PROF_7301:{
+                struct dvb_tuner_ops *tuner_ops = NULL;
+
+                fe0->dvb.frontend = dvb_attach(stv0900_attach,
+                                                &prof_7301_stv0900_config,
+                                                &core->i2c_adap, 0);
+                if (fe0->dvb.frontend != NULL) {
+                        if (!dvb_attach(stb6100_attach, fe0->dvb.frontend,
+                                        &prof_7301_stb6100_config,
+                                        &core->i2c_adap))
+                                goto frontend_detach;
+
+                        tuner_ops = &fe0->dvb.frontend->ops.tuner_ops;
+                        tuner_ops->set_frequency = stb6100_set_freq;
+                        tuner_ops->get_frequency = stb6100_get_freq;
+                        tuner_ops->set_bandwidth = stb6100_set_bandw;
+                        tuner_ops->get_bandwidth = stb6100_get_bandw;
+
+                        core->prev_set_voltage =
+                                        fe0->dvb.frontend->ops.set_voltage;
+                        fe0->dvb.frontend->ops.set_voltage =
+                                        tevii_dvbs_set_voltage;
+                }
+                break;
+                }
         default:
                 printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card isn't supported yet\n",
                        core->name);
@@ -1170,11 +1224,11 @@ static int dvb_register(struct cx8802_dev *dev)
                 fe1->dvb.frontend->ops.ts_bus_ctrl = cx88_dvb_bus_ctrl;
 
         /* Put the analog decoder in standby to keep it quiet */
-        call_all(core, tuner, s_standby);
+        call_all(core, core, s_power, 0);
 
         /* register everything */
         return videobuf_dvb_register_bus(&dev->frontends, THIS_MODULE, dev,
-                &dev->pci->dev, adapter_nr, mfe_shared);
+                                         &dev->pci->dev, adapter_nr, mfe_shared, NULL);
 
 frontend_detach:
         core->gate_ctrl = NULL;
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 78b3635178af..92b8cdf9fb81 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -118,13 +118,13 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
 
                 data = (data << 4) | ((gpio_key & 0xf0) >> 4);
 
-                ir_input_keydown(ir->input, &ir->ir, data, data);
+                ir_input_keydown(ir->input, &ir->ir, data);
                 ir_input_nokey(ir->input, &ir->ir);
 
         } else if (ir->mask_keydown) {
                 /* bit set on keydown */
                 if (gpio & ir->mask_keydown) {
-                        ir_input_keydown(ir->input, &ir->ir, data, data);
+                        ir_input_keydown(ir->input, &ir->ir, data);
                 } else {
                         ir_input_nokey(ir->input, &ir->ir);
                 }
@@ -132,14 +132,14 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
         } else if (ir->mask_keyup) {
                 /* bit cleared on keydown */
                 if (0 == (gpio & ir->mask_keyup)) {
-                        ir_input_keydown(ir->input, &ir->ir, data, data);
+                        ir_input_keydown(ir->input, &ir->ir, data);
                 } else {
                         ir_input_nokey(ir->input, &ir->ir);
                 }
 
         } else {
                 /* can't distinguish keydown/up :-/ */
-                ir_input_keydown(ir->input, &ir->ir, data, data);
+                ir_input_keydown(ir->input, &ir->ir, data);
                 ir_input_nokey(ir->input, &ir->ir);
         }
 }
@@ -303,6 +303,23 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
                 ir->mask_keydown = 0x02;
                 ir->polling      = 50; /* ms */
                 break;
+        case CX88_BOARD_OMICOM_SS4_PCI:
+        case CX88_BOARD_SATTRADE_ST4200:
+        case CX88_BOARD_TBS_8920:
+        case CX88_BOARD_TBS_8910:
+        case CX88_BOARD_PROF_7300:
+        case CX88_BOARD_PROF_7301:
+        case CX88_BOARD_PROF_6200:
+                ir_codes = &ir_codes_tbs_nec_table;
+                ir_type = IR_TYPE_PD;
+                ir->sampling = 0xff00; /* address */
+                break;
+        case CX88_BOARD_TEVII_S460:
+        case CX88_BOARD_TEVII_S420:
+                ir_codes = &ir_codes_tevii_nec_table;
+                ir_type = IR_TYPE_PD;
+                ir->sampling = 0xff00; /* address */
+                break;
         case CX88_BOARD_DNTV_LIVE_DVB_T_PRO:
                 ir_codes         = &ir_codes_dntv_live_dvbt_pro_table;
                 ir_type          = IR_TYPE_PD;
@@ -343,7 +360,10 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         snprintf(ir->name, sizeof(ir->name), "cx88 IR (%s)", core->board.name);
         snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0", pci_name(pci));
 
-        ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);
+        err = ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);
+        if (err < 0)
+                goto err_out_free;
+
         input_dev->name = ir->name;
         input_dev->phys = ir->phys;
         input_dev->id.bustype = BUS_PCI;
@@ -373,6 +393,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         cx88_ir_stop(core, ir);
         core->ir = NULL;
  err_out_free:
+        ir_input_free(input_dev);
         input_free_device(input_dev);
         kfree(ir);
         return err;
@@ -387,6 +408,7 @@ int cx88_ir_fini(struct cx88_core *core)
                 return 0;
 
         cx88_ir_stop(core, ir);
+        ir_input_free(ir->input);
         input_unregister_device(ir->input);
         kfree(ir);
 
@@ -432,8 +454,17 @@ void cx88_ir_irq(struct cx88_core *core)
 
         /* decode it */
         switch (core->boardnr) {
+        case CX88_BOARD_TEVII_S460:
+        case CX88_BOARD_TEVII_S420:
         case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1:
         case CX88_BOARD_DNTV_LIVE_DVB_T_PRO:
+        case CX88_BOARD_OMICOM_SS4_PCI:
+        case CX88_BOARD_SATTRADE_ST4200:
+        case CX88_BOARD_TBS_8920:
+        case CX88_BOARD_TBS_8910:
+        case CX88_BOARD_PROF_7300:
+        case CX88_BOARD_PROF_7301:
+        case CX88_BOARD_PROF_6200:
                 ircode = ir_decode_pulsedistance(ir->samples, ir->scount, 1, 4);
 
                 if (ircode == 0xffffffff) { /* decoding error */
@@ -461,7 +492,7 @@ void cx88_ir_irq(struct cx88_core *core)
 
                 ir_dprintk("Key Code: %x\n", (ircode >> 16) & 0x7f);
 
-                ir_input_keydown(ir->input, &ir->ir, (ircode >> 16) & 0x7f, (ircode >> 16) & 0xff);
+                ir_input_keydown(ir->input, &ir->ir, (ircode >> 16) & 0x7f);
                 ir->release = jiffies + msecs_to_jiffies(120);
                 break;
         case CX88_BOARD_HAUPPAUGE:
@@ -498,7 +529,7 @@ void cx88_ir_irq(struct cx88_core *core)
                 if ( dev != 0x1e && dev != 0x1f )
                         /* not a hauppauge remote */
                         break;
-                ir_input_keydown(ir->input, &ir->ir, code, ircode);
+                ir_input_keydown(ir->input, &ir->ir, code);
                 ir->release = jiffies + msecs_to_jiffies(120);
                 break;
         case CX88_BOARD_PINNACLE_PCTV_HD_800i:
@@ -506,7 +537,7 @@ void cx88_ir_irq(struct cx88_core *core)
                 ir_dprintk("biphase decoded: %x\n", ircode);
                 if ((ircode & 0xfffff000) != 0x3000)
                         break;
-                ir_input_keydown(ir->input, &ir->ir, ircode & 0x3f, ircode);
+                ir_input_keydown(ir->input, &ir->ir, ircode & 0x3f);
                 ir->release = jiffies + msecs_to_jiffies(120);
                 break;
         }
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 57e6b1241090..d7e8fcee559c 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -935,7 +935,7 @@ static int video_release(struct file *file)
 
         mutex_lock(&dev->core->lock);
         if(atomic_dec_and_test(&dev->core->users))
-                call_all(dev->core, tuner, s_standby);
+                call_all(dev->core, core, s_power, 0);
         mutex_unlock(&dev->core->lock);
 
         return 0;
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index d5cea41f4207..e1c521710103 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -238,6 +238,7 @@ extern struct sram_channel cx88_sram_channels[];
 #define CX88_BOARD_HAUPPAUGE_IRONLY        80
 #define CX88_BOARD_WINFAST_DTV1800H        81
 #define CX88_BOARD_WINFAST_DTV2000H_J      82
+#define CX88_BOARD_PROF_7301               83
 
 enum cx88_itype {
         CX88_VMUX_COMPOSITE1 = 1,