1 files changed, 99 insertions, 12 deletions

diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index 14b00f57b5de..2293d80c6e51 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -45,6 +45,7 @@
 #include "tda826x.h"
 #include "lnbp21.h"
 #include "bsru6.h"
+#include "bsbe1.h"
 
 static int diseqc_method;
 module_param(diseqc_method, int, 0444);
@@ -257,11 +258,17 @@ static struct ves1820_config alps_tdbe2_config = {
 
 static int grundig_29504_401_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
 {
-        struct budget* budget = (struct budget*) fe->dvb->priv;
+        struct budget *budget = fe->dvb->priv;
+        u8 *tuner_addr = fe->tuner_priv;
         u32 div;
         u8 cfg, cpump, band_select;
         u8 data[4];
-        struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };
+        struct i2c_msg msg = { .flags = 0, .buf = data, .len = sizeof(data) };
+
+        if (tuner_addr)
+                msg.addr = *tuner_addr;
+        else
+                msg.addr = 0x61;
 
         div = (36125000 + params->frequency) / 166666;
 
@@ -292,6 +299,12 @@ static struct l64781_config grundig_29504_401_config = {
         .demod_address = 0x55,
 };
 
+static struct l64781_config grundig_29504_401_config_activy = {
+        .demod_address = 0x54,
+};
+
+static u8 tuner_address_grundig_29504_401_activy = 0x60;
+
 static int grundig_29504_451_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
 {
         struct budget* budget = (struct budget*) fe->dvb->priv;
@@ -346,14 +359,48 @@ static int s5h1420_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend
 static struct s5h1420_config s5h1420_config = {
         .demod_address = 0x53,
         .invert = 1,
+        .cdclk_polarity = 1,
 };
 
 static struct tda10086_config tda10086_config = {
         .demod_address = 0x0e,
         .invert = 0,
         .diseqc_tone = 1,
+        .xtal_freq = TDA10086_XTAL_16M,
 };
 
+static struct stv0299_config alps_bsru6_config_activy = {
+        .demod_address = 0x68,
+        .inittab = alps_bsru6_inittab,
+        .mclk = 88000000UL,
+        .invert = 1,
+        .op0_off = 1,
+        .min_delay_ms = 100,
+        .set_symbol_rate = alps_bsru6_set_symbol_rate,
+};
+
+static struct stv0299_config alps_bsbe1_config_activy = {
+        .demod_address = 0x68,
+        .inittab = alps_bsbe1_inittab,
+        .mclk = 88000000UL,
+        .invert = 1,
+        .op0_off = 1,
+        .min_delay_ms = 100,
+        .set_symbol_rate = alps_bsbe1_set_symbol_rate,
+};
+
+
+static int i2c_readreg(struct i2c_adapter *i2c, u8 adr, u8 reg)
+{
+        u8 val;
+        struct i2c_msg msg[] = {
+                { .addr = adr, .flags = 0, .buf = &reg, .len = 1 },
+                { .addr = adr, .flags = I2C_M_RD, .buf = &val, .len = 1 }
+        };
+
+        return (i2c_transfer(i2c, msg, 2) != 2) ? -EIO : val;
+}
+
 static u8 read_pwm(struct budget* budget)
 {
         u8 b = 0xff;
@@ -369,6 +416,8 @@ static u8 read_pwm(struct budget* budget)
 
 static void frontend_init(struct budget *budget)
 {
+        (void)alps_bsbe1_config; /* avoid warning */
+
         switch(budget->dev->pci->subsystem_device) {
         case 0x1003: // Hauppauge/TT Nova budget (stv0299/ALPS BSRU6(tsa5059) OR ves1893/ALPS BSRV2(sp5659))
         case 0x1013:
@@ -414,15 +463,43 @@ static void frontend_init(struct budget *budget)
                 }
                 break;
 
-        case 0x4f60: // Fujitsu Siemens Activy Budget-S PCI rev AL (stv0299/ALPS BSRU6(tsa5059))
-                budget->dvb_frontend = dvb_attach(stv0299_attach, &alps_bsru6_config, &budget->i2c_adap);
-                if (budget->dvb_frontend) {
-                        budget->dvb_frontend->ops.tuner_ops.set_params = alps_bsru6_tuner_set_params;
-                        budget->dvb_frontend->tuner_priv = &budget->i2c_adap;
-                        budget->dvb_frontend->ops.set_voltage = siemens_budget_set_voltage;
-                        budget->dvb_frontend->ops.dishnetwork_send_legacy_command = NULL;
+        case 0x4f60: /* Fujitsu Siemens Activy Budget-S PCI rev AL (stv0299/tsa5059) */
+        {
+                int subtype = i2c_readreg(&budget->i2c_adap, 0x50, 0x67);
+
+                if (subtype < 0)
+                        break;
+                /* fixme: find a better way to identify the card */
+                if (subtype < 0x36) {
+                        /* assume ALPS BSRU6 */
+                        budget->dvb_frontend = dvb_attach(stv0299_attach, &alps_bsru6_config_activy, &budget->i2c_adap);
+                        if (budget->dvb_frontend) {
+                                printk(KERN_INFO "budget: tuner ALPS BSRU6 detected\n");
+                                budget->dvb_frontend->ops.tuner_ops.set_params = alps_bsru6_tuner_set_params;
+                                budget->dvb_frontend->tuner_priv = &budget->i2c_adap;
+                                budget->dvb_frontend->ops.set_voltage = siemens_budget_set_voltage;
+                                budget->dvb_frontend->ops.dishnetwork_send_legacy_command = NULL;
+                                break;
+                        }
+                } else {
+                        /* assume ALPS BSBE1 */
+                        /* reset tuner */
+                        saa7146_setgpio(budget->dev, 3, SAA7146_GPIO_OUTLO);
+                        msleep(50);
+                        saa7146_setgpio(budget->dev, 3, SAA7146_GPIO_OUTHI);
+                        msleep(250);
+                        budget->dvb_frontend = dvb_attach(stv0299_attach, &alps_bsbe1_config_activy, &budget->i2c_adap);
+                        if (budget->dvb_frontend) {
+                                printk(KERN_INFO "budget: tuner ALPS BSBE1 detected\n");
+                                budget->dvb_frontend->ops.tuner_ops.set_params = alps_bsbe1_tuner_set_params;
+                                budget->dvb_frontend->tuner_priv = &budget->i2c_adap;
+                                budget->dvb_frontend->ops.set_voltage = siemens_budget_set_voltage;
+                                budget->dvb_frontend->ops.dishnetwork_send_legacy_command = NULL;
+                                break;
+                        }
                 }
                 break;
+        }
 
         case 0x4f61: // Fujitsu Siemens Activy Budget-S PCI rev GR (tda8083/Grundig 29504-451(tsa5522))
                 budget->dvb_frontend = dvb_attach(tda8083_attach, &grundig_29504_451_config, &budget->i2c_adap);
@@ -433,12 +510,20 @@ static void frontend_init(struct budget *budget)
                 }
                 break;
 
+        case 0x5f61: /* Fujitsu Siemens Activy Budget-T PCI rev GR (L64781/Grundig 29504-401(tsa5060)) */
+                budget->dvb_frontend = dvb_attach(l64781_attach, &grundig_29504_401_config_activy, &budget->i2c_adap);
+                if (budget->dvb_frontend) {
+                        budget->dvb_frontend->tuner_priv = &tuner_address_grundig_29504_401_activy;
+                        budget->dvb_frontend->ops.tuner_ops.set_params = grundig_29504_401_tuner_set_params;
+                }
+                break;
+
         case 0x1016: // Hauppauge/TT Nova-S SE (samsung s5h1420/????(tda8260))
                 budget->dvb_frontend = dvb_attach(s5h1420_attach, &s5h1420_config, &budget->i2c_adap);
                 if (budget->dvb_frontend) {
                         budget->dvb_frontend->ops.tuner_ops.set_params = s5h1420_tuner_set_params;
                         if (dvb_attach(lnbp21_attach, budget->dvb_frontend, &budget->i2c_adap, 0, 0) == NULL) {
-                                printk("%s: No LNBP21 found!\n", __FUNCTION__);
+                                printk("%s: No LNBP21 found!\n", __func__);
                                 goto error_out;
                         }
                         break;
@@ -454,9 +539,9 @@ static void frontend_init(struct budget *budget)
                 budget->dvb_frontend = dvb_attach(tda10086_attach, &tda10086_config, &budget->i2c_adap);
                 if (budget->dvb_frontend) {
                         if (dvb_attach(tda826x_attach, budget->dvb_frontend, 0x60, &budget->i2c_adap, 0) == NULL)
-                                printk("%s: No tda826x found!\n", __FUNCTION__);
+                                printk("%s: No tda826x found!\n", __func__);
                         if (dvb_attach(lnbp21_attach, budget->dvb_frontend, &budget->i2c_adap, 0, 0) == NULL) {
-                                printk("%s: No LNBP21 found!\n", __FUNCTION__);
+                                printk("%s: No LNBP21 found!\n", __func__);
                                 goto error_out;
                         }
                         break;
@@ -537,6 +622,7 @@ MAKE_BUDGET_INFO(satel,	"SATELCO Multimedia PCI",	BUDGET_TT_HW_DISEQC);
 MAKE_BUDGET_INFO(ttbs1401, "TT-Budget-S-1401 PCI", BUDGET_TT);
 MAKE_BUDGET_INFO(fsacs0, "Fujitsu Siemens Activy Budget-S PCI (rev GR/grundig frontend)", BUDGET_FS_ACTIVY);
 MAKE_BUDGET_INFO(fsacs1, "Fujitsu Siemens Activy Budget-S PCI (rev AL/alps frontend)", BUDGET_FS_ACTIVY);
+MAKE_BUDGET_INFO(fsact,  "Fujitsu Siemens Activy Budget-T PCI (rev GR/Grundig frontend)", BUDGET_FS_ACTIVY);
 
 static struct pci_device_id pci_tbl[] = {
         MAKE_EXTENSION_PCI(ttbs,  0x13c2, 0x1003),
@@ -547,6 +633,7 @@ static struct pci_device_id pci_tbl[] = {
         MAKE_EXTENSION_PCI(ttbs1401, 0x13c2, 0x1018),
         MAKE_EXTENSION_PCI(fsacs1,0x1131, 0x4f60),
         MAKE_EXTENSION_PCI(fsacs0,0x1131, 0x4f61),
+        MAKE_EXTENSION_PCI(fsact, 0x1131, 0x5f61),
         {
                 .vendor    = 0,
         }