V4L/DVB (3404): Refactored LNBP21 and BSBE1 support

Moved duplicated code to separate files.
LNBP21 stuff rewritten from scratch, BSBE1 copied from av7110.c.
Modified budget driver to use the new routines.

Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 4 insertions, 137 deletions

diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index 238c77b52f89..2a0e3efd81c7 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -41,6 +41,8 @@
 #include "l64781.h"
 #include "tda8083.h"
 #include "s5h1420.h"
+#include "lnbp21.h"
+#include "bsbe1.h"
 
 static void Set22K (struct budget *budget, int state)
 {
@@ -184,64 +186,6 @@ static int budget_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t m
         return 0;
 }
 
-static int lnbp21_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)
-{
-        struct budget* budget = (struct budget*) fe->dvb->priv;
-        u8 buf;
-        struct i2c_msg msg = { .addr = 0x08, .flags = I2C_M_RD, .buf = &buf, .len = sizeof(buf) };
-
-        if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
-
-        switch(voltage) {
-        case SEC_VOLTAGE_13:
-                buf = (buf & 0xf7) | 0x04;
-                break;
-
-        case SEC_VOLTAGE_18:
-                buf = (buf & 0xf7) | 0x0c;
-                break;
-
-        case SEC_VOLTAGE_OFF:
-                buf = buf & 0xf0;
-                break;
-        }
-
-        msg.flags = 0;
-        if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
-
-        return 0;
-}
-
-static int lnbp21_enable_high_lnb_voltage(struct dvb_frontend* fe, long arg)
-{
-        struct budget* budget = (struct budget*) fe->dvb->priv;
-        u8 buf;
-        struct i2c_msg msg = { .addr = 0x08, .flags = I2C_M_RD, .buf = &buf, .len = sizeof(buf) };
-
-        if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
-
-        if (arg) {
-                buf = buf | 0x10;
-        } else {
-                buf = buf & 0xef;
-        }
-
-        msg.flags = 0;
-        if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
-
-        return 0;
-}
-
-static int lnbp21_init(struct budget* budget)
-{
-        u8 buf = 0x00;
-        struct i2c_msg msg = { .addr = 0x08, .flags = 0, .buf = &buf, .len = sizeof(buf) };
-
-        if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1)
-                return -EIO;
-        return 0;
-}
-
 static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
 {
         struct budget* budget = (struct budget*) fe->dvb->priv;
@@ -374,79 +318,6 @@ static struct stv0299_config alps_bsru6_config = {
         .pll_set = alps_bsru6_pll_set,
 };
 
-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, 0xb9,
-        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, // 0x80 = inverse AGC
-        0xff, 0xff
-};
-
-static int alps_bsbe1_pll_set(struct dvb_frontend* fe, struct i2c_adapter *i2c, struct dvb_frontend_parameters* params)
-{
-        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(i2c, &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,
-        .skip_reinit = 0,
-        .min_delay_ms = 100,
-        .set_symbol_rate = alps_bsru6_set_symbol_rate,
-        .pll_set = alps_bsbe1_pll_set,
-};
-
 static int alps_tdbe2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
 {
         struct budget* budget = (struct budget*) fe->dvb->priv;
@@ -584,10 +455,8 @@ static void frontend_init(struct budget *budget)
                 // try the ALPS BSBE1 now
                 budget->dvb_frontend = stv0299_attach(&alps_bsbe1_config, &budget->i2c_adap);
                 if (budget->dvb_frontend) {
-                        budget->dvb_frontend->ops->set_voltage = lnbp21_set_voltage;
-                        budget->dvb_frontend->ops->enable_high_lnb_voltage = lnbp21_enable_high_lnb_voltage;
                         budget->dvb_frontend->ops->dishnetwork_send_legacy_command = NULL;
-                        if (lnbp21_init(budget)) {
+                        if (lnbp21_init(budget->dvb_frontend, &budget->i2c_adap, LNBP21_LLC, 0)) {
                                 printk("%s: No LNBP21 found!\n", __FUNCTION__);
                                 goto error_out;
                         }
@@ -646,9 +515,7 @@ static void frontend_init(struct budget *budget)
         case 0x1016: // Hauppauge/TT Nova-S SE (samsung s5h1420/????(tda8260))
                 budget->dvb_frontend = s5h1420_attach(&s5h1420_config, &budget->i2c_adap);
                 if (budget->dvb_frontend) {
-                        budget->dvb_frontend->ops->set_voltage = lnbp21_set_voltage;
-                        budget->dvb_frontend->ops->enable_high_lnb_voltage = lnbp21_enable_high_lnb_voltage;
-                        if (lnbp21_init(budget)) {
+                        if (lnbp21_init(budget->dvb_frontend, &budget->i2c_adap, 0, 0)) {
                                 printk("%s: No LNBP21 found!\n", __FUNCTION__);
                                 goto error_out;
                         }