Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[powerpc.git] / drivers / media / dvb / frontends / zl10353.c

diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
index 2b95e8b..245f9b7 100644 (file)
--- a/drivers/media/dvb/frontends/zl10353.c
+++ b/drivers/media/dvb/frontends/zl10353.c
@@ -38,6 +38,12 @@ struct zl10353_state {
        struct zl10353_config config;
 };
 
+static int debug;
+#define dprintk(args...) \
+       do { \
+               if (debug) printk(KERN_DEBUG "zl10353: " args); \
+       } while (0)
+
 static int debug_regs = 0;
 
 static int zl10353_single_write(struct dvb_frontend *fe, u8 reg, u8 val)
@@ -54,7 +60,7 @@ static int zl10353_single_write(struct dvb_frontend *fe, u8 reg, u8 val)
        return 0;
 }
 
-int zl10353_write(struct dvb_frontend *fe, u8 *ibuf, int ilen)
+static int zl10353_write(struct dvb_frontend *fe, u8 *ibuf, int ilen)
 {
        int err, i;
        for (i = 0; i < ilen - 1; i++)
@@ -113,6 +119,36 @@ static void zl10353_dump_regs(struct dvb_frontend *fe)
        printk(KERN_DEBUG "%s\n", buf);
 }
 
+static void zl10353_calc_nominal_rate(struct dvb_frontend *fe,
+                                     enum fe_bandwidth bandwidth,
+                                     u16 *nominal_rate)
+{
+       u32 adc_clock = 22528; /* 20.480 MHz on the board(!?) */
+       u8 bw;
+       struct zl10353_state *state = fe->demodulator_priv;
+
+       if (state->config.adc_clock)
+               adc_clock = state->config.adc_clock;
+
+       switch (bandwidth) {
+       case BANDWIDTH_6_MHZ:
+               bw = 6;
+               break;
+       case BANDWIDTH_7_MHZ:
+               bw = 7;
+               break;
+       case BANDWIDTH_8_MHZ:
+       default:
+               bw = 8;
+               break;
+       }
+
+       *nominal_rate = (64 * bw * (1<<16) / (7 * 8) * 4000 / adc_clock + 2) / 4;
+
+       dprintk("%s: bw %d, adc_clock %d => 0x%x\n",
+               __FUNCTION__, bw, adc_clock, *nominal_rate);
+}
+
 static int zl10353_sleep(struct dvb_frontend *fe)
 {
        static u8 zl10353_softdown[] = { 0x50, 0x0C, 0x44 };
@@ -125,7 +161,7 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,
                                  struct dvb_frontend_parameters *param)
 {
        struct zl10353_state *state = fe->demodulator_priv;
-
+       u16 nominal_rate;
        u8 pllbuf[6] = { 0x67 };
 
        /* These settings set "auto-everything" and start the FSM. */
@@ -138,16 +174,23 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,
        zl10353_single_write(fe, 0x56, 0x28);
        zl10353_single_write(fe, 0x89, 0x20);
        zl10353_single_write(fe, 0x5E, 0x00);
-       zl10353_single_write(fe, 0x65, 0x5A);
-       zl10353_single_write(fe, 0x66, 0xE9);
-       zl10353_single_write(fe, 0x62, 0x0A);
+
+       zl10353_calc_nominal_rate(fe, param->u.ofdm.bandwidth, &nominal_rate);
+       zl10353_single_write(fe, TRL_NOMINAL_RATE_1, msb(nominal_rate));
+       zl10353_single_write(fe, TRL_NOMINAL_RATE_0, lsb(nominal_rate));
+
+       zl10353_single_write(fe, 0x6C, 0xCD);
+       zl10353_single_write(fe, 0x6D, 0x7E);
+       if (fe->ops.i2c_gate_ctrl)
+               fe->ops.i2c_gate_ctrl(fe, 0);
 
        // if there is no attached secondary tuner, we call set_params to program
        // a potential tuner attached somewhere else
        if (state->config.no_tuner) {
                if (fe->ops.tuner_ops.set_params) {
                        fe->ops.tuner_ops.set_params(fe, param);
-                       if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
+                       if (fe->ops.i2c_gate_ctrl)
+                               fe->ops.i2c_gate_ctrl(fe, 0);
                }
        }
 
@@ -168,6 +211,7 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,
        // even if there isn't a PLL attached to the secondary bus
        zl10353_write(fe, pllbuf, sizeof(pllbuf));
 
+       zl10353_single_write(fe, 0x5F, 0x13);
        zl10353_single_write(fe, 0x70, 0x01);
        udelay(250);
        zl10353_single_write(fe, 0xE4, 0x00);
@@ -210,6 +254,29 @@ static int zl10353_read_status(struct dvb_frontend *fe, fe_status_t *status)
        return 0;
 }
 
+static int zl10353_read_ber(struct dvb_frontend *fe, u32 *ber)
+{
+       struct zl10353_state *state = fe->demodulator_priv;
+
+       *ber = zl10353_read_register(state, RS_ERR_CNT_2) << 16 |
+              zl10353_read_register(state, RS_ERR_CNT_1) << 8 |
+              zl10353_read_register(state, RS_ERR_CNT_0);
+
+       return 0;
+}
+
+static int zl10353_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
+{
+       struct zl10353_state *state = fe->demodulator_priv;
+
+       u16 signal = zl10353_read_register(state, AGC_GAIN_1) << 10 |
+                    zl10353_read_register(state, AGC_GAIN_0) << 2 | 3;
+
+       *strength = ~signal;
+
+       return 0;
+}
+
 static int zl10353_read_snr(struct dvb_frontend *fe, u16 *snr)
 {
        struct zl10353_state *state = fe->demodulator_priv;
@@ -224,6 +291,16 @@ static int zl10353_read_snr(struct dvb_frontend *fe, u16 *snr)
        return 0;
 }
 
+static int zl10353_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
+{
+       struct zl10353_state *state = fe->demodulator_priv;
+
+       *ucblocks = zl10353_read_register(state, RS_UBC_1) << 8 |
+                   zl10353_read_register(state, RS_UBC_0);
+
+       return 0;
+}
+
 static int zl10353_get_tune_settings(struct dvb_frontend *fe,
                                     struct dvb_frontend_tune_settings
                                         *fe_tune_settings)
@@ -243,9 +320,12 @@ static int zl10353_init(struct dvb_frontend *fe)
 
        if (debug_regs)
                zl10353_dump_regs(fe);
+       if (state->config.parallel_ts)
+               zl10353_reset_attach[2] &= ~0x20;
 
        /* Do a "hard" reset if not already done */
-       if (zl10353_read_register(state, 0x50) != 0x03) {
+       if (zl10353_read_register(state, 0x50) != zl10353_reset_attach[1] ||
+           zl10353_read_register(state, 0x51) != zl10353_reset_attach[2]) {
                rc = zl10353_write(fe, zl10353_reset_attach,
                                   sizeof(zl10353_reset_attach));
                if (debug_regs)
@@ -255,10 +335,19 @@ static int zl10353_init(struct dvb_frontend *fe)
        return 0;
 }
 
+static int zl10353_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)
+{
+       u8 val = 0x0a;
+
+       if (enable)
+               val |= 0x10;
+
+       return zl10353_single_write(fe, 0x62, val);
+}
+
 static void zl10353_release(struct dvb_frontend *fe)
 {
        struct zl10353_state *state = fe->demodulator_priv;
-
        kfree(state);
 }
 
@@ -314,14 +403,22 @@ static struct dvb_frontend_ops zl10353_ops = {
 
        .init = zl10353_init,
        .sleep = zl10353_sleep,
+       .i2c_gate_ctrl = zl10353_i2c_gate_ctrl,
+       .write = zl10353_write,
 
        .set_frontend = zl10353_set_parameters,
        .get_tune_settings = zl10353_get_tune_settings,
 
        .read_status = zl10353_read_status,
+       .read_ber = zl10353_read_ber,
+       .read_signal_strength = zl10353_read_signal_strength,
        .read_snr = zl10353_read_snr,
+       .read_ucblocks = zl10353_read_ucblocks,
 };
 
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
+
 module_param(debug_regs, int, 0644);
 MODULE_PARM_DESC(debug_regs, "Turn on/off frontend register dumps (default:off).");
 
@@ -330,4 +427,3 @@ MODULE_AUTHOR("Chris Pascoe");
 MODULE_LICENSE("GPL");
 
 EXPORT_SYMBOL(zl10353_attach);
-EXPORT_SYMBOL(zl10353_write);