V4L/DVB (13407): Add Prof 7301 PCI DVB-S2 card

Add Prof 7301 PCI DVB-S2 card

The card based on stv0903 demod, stb6100 tuner.

Signed-off-by: Igor M. Liplianin <liplianin@me.by>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

9 files changed, 220 insertions, 0 deletions

diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88
index 3385f8b094a..7ec3c4e4b60 100644
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/Documentation/video4linux/CARDLIST.cx88
@@ -81,3 +81,4 @@
  80 -> Hauppauge WinTV-IR Only                             [0070:9290]
  81 -> Leadtek WinFast DTV1800 Hybrid                      [107d:6654]
  82 -> WinFast DTV2000 H rev. J                            [107d:6f2b]
+ 83 -> Prof 7301 DVB-S/S2                                  [b034:3034]
diff --git a/drivers/media/dvb/frontends/stb6100_proc.h b/drivers/media/dvb/frontends/stb6100_proc.h
new file mode 100644
index 00000000000..112163a4862
--- /dev/null
+++ b/drivers/media/dvb/frontends/stb6100_proc.h
@@ -0,0 +1,138 @@
+/*
+        STB6100 Silicon Tuner wrapper
+        Copyright (C)2009 Igor M. Liplianin (liplianin@me.by)
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+static int stb6100_get_freq(struct dvb_frontend *fe, u32 *frequency)
+{
+        struct dvb_frontend_ops *frontend_ops = NULL;
+        struct dvb_tuner_ops    *tuner_ops = NULL;
+        struct tuner_state      state;
+        int err = 0;
+
+        if (&fe->ops)
+                frontend_ops = &fe->ops;
+        if (&frontend_ops->tuner_ops)
+                tuner_ops = &frontend_ops->tuner_ops;
+        if (tuner_ops->get_state) {
+                if (frontend_ops->i2c_gate_ctrl)
+                        frontend_ops->i2c_gate_ctrl(fe, 1);
+
+                err = tuner_ops->get_state(fe, DVBFE_TUNER_FREQUENCY, &state);
+                if (err < 0) {
+                        printk(KERN_ERR "%s: Invalid parameter\n", __func__);
+                        return err;
+                }
+
+                if (frontend_ops->i2c_gate_ctrl)
+                        frontend_ops->i2c_gate_ctrl(fe, 0);
+
+                *frequency = state.frequency;
+        }
+
+        return 0;
+}
+
+static int stb6100_set_freq(struct dvb_frontend *fe, u32 frequency)
+{
+        struct dvb_frontend_ops *frontend_ops = NULL;
+        struct dvb_tuner_ops    *tuner_ops = NULL;
+        struct tuner_state      state;
+        int err = 0;
+
+        state.frequency = frequency;
+        if (&fe->ops)
+                frontend_ops = &fe->ops;
+        if (&frontend_ops->tuner_ops)
+                tuner_ops = &frontend_ops->tuner_ops;
+        if (tuner_ops->set_state) {
+                if (frontend_ops->i2c_gate_ctrl)
+                        frontend_ops->i2c_gate_ctrl(fe, 1);
+
+                err = tuner_ops->set_state(fe, DVBFE_TUNER_FREQUENCY, &state);
+                if (err < 0) {
+                        printk(KERN_ERR "%s: Invalid parameter\n", __func__);
+                        return err;
+                }
+
+                if (frontend_ops->i2c_gate_ctrl)
+                        frontend_ops->i2c_gate_ctrl(fe, 0);
+
+        }
+
+        return 0;
+}
+
+static int stb6100_get_bandw(struct dvb_frontend *fe, u32 *bandwidth)
+{
+        struct dvb_frontend_ops *frontend_ops = NULL;
+        struct dvb_tuner_ops    *tuner_ops = NULL;
+        struct tuner_state      state;
+        int err = 0;
+
+        if (&fe->ops)
+                frontend_ops = &fe->ops;
+        if (&frontend_ops->tuner_ops)
+                tuner_ops = &frontend_ops->tuner_ops;
+        if (tuner_ops->get_state) {
+                if (frontend_ops->i2c_gate_ctrl)
+                        frontend_ops->i2c_gate_ctrl(fe, 1);
+
+                err = tuner_ops->get_state(fe, DVBFE_TUNER_BANDWIDTH, &state);
+                if (err < 0) {
+                        printk(KERN_ERR "%s: Invalid parameter\n", __func__);
+                        return err;
+                }
+
+                if (frontend_ops->i2c_gate_ctrl)
+                        frontend_ops->i2c_gate_ctrl(fe, 0);
+
+                *bandwidth = state.bandwidth;
+        }
+
+        return 0;
+}
+
+static int stb6100_set_bandw(struct dvb_frontend *fe, u32 bandwidth)
+{
+        struct dvb_frontend_ops *frontend_ops = NULL;
+        struct dvb_tuner_ops    *tuner_ops = NULL;
+        struct tuner_state      state;
+        int err = 0;
+
+        state.bandwidth = bandwidth;
+        if (&fe->ops)
+                frontend_ops = &fe->ops;
+        if (&frontend_ops->tuner_ops)
+                tuner_ops = &frontend_ops->tuner_ops;
+        if (tuner_ops->set_state) {
+                if (frontend_ops->i2c_gate_ctrl)
+                        frontend_ops->i2c_gate_ctrl(fe, 1);
+
+                err = tuner_ops->set_state(fe, DVBFE_TUNER_BANDWIDTH, &state);
+                if (err < 0) {
+                        printk(KERN_ERR "%s: Invalid parameter\n", __func__);
+                        return err;
+                }
+
+                if (frontend_ops->i2c_gate_ctrl)
+                        frontend_ops->i2c_gate_ctrl(fe, 0);
+
+        }
+
+        return 0;
+}
diff --git a/drivers/media/dvb/frontends/stv0900.h b/drivers/media/dvb/frontends/stv0900.h
index 446bdfc8ad1..29c3fa85c22 100644
--- a/drivers/media/dvb/frontends/stv0900.h
+++ b/drivers/media/dvb/frontends/stv0900.h
@@ -49,6 +49,8 @@ struct stv0900_config {
         u8 tun2_maddress;
         u8 tun1_adc;/* 1 for stv6110, 2 for stb6100 */
         u8 tun2_adc;
+        /* Set device param to start dma */
+        int (*set_ts_params)(struct dvb_frontend *fe, int is_punctured);
 };
 
 #if defined(CONFIG_DVB_STV0900) || (defined(CONFIG_DVB_STV0900_MODULE) \
diff --git a/drivers/media/dvb/frontends/stv0900_core.c b/drivers/media/dvb/frontends/stv0900_core.c
index e2062048f43..df49ea0983b 100644
--- a/drivers/media/dvb/frontends/stv0900_core.c
+++ b/drivers/media/dvb/frontends/stv0900_core.c
@@ -1494,6 +1494,9 @@ static enum dvbfe_search stv0900_search(struct dvb_frontend *fe,
         if (!(INRANGE(100000, c->symbol_rate, 70000000)))
                 return DVBFE_ALGO_SEARCH_FAILED;
 
+        if (state->config->set_ts_params)
+                state->config->set_ts_params(fe, 0);
+
         p_result.locked = FALSE;
         p_search.path = demod;
         p_search.frequency = c->frequency;
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
index 49952980dab..c7e5851d348 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 7330a2d7043..d844f2aaa01 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);
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 9df71d0244a..b1429692325 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);
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index c0047c1960c..47c03019357 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -308,6 +308,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         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;
@@ -457,6 +458,7 @@ void cx88_ir_irq(struct cx88_core *core)
         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);
 
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index d5cea41f420..e1c52171010 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,