V4L/DVB: lgdt3305: consolidate init functions

Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/frontends/lgdt3305.c b/drivers/media/dvb/frontends/lgdt3305.c
index 910cd785081df14cd6c6b8cbed9bea3e8fadeee1..de313b13c9e23db61939d91d9461adafe4d0fc74 100644 (file)
--- a/drivers/media/dvb/frontends/lgdt3305.c
+++ b/drivers/media/dvb/frontends/lgdt3305.c
@@ -587,115 +587,84 @@ static int lgdt3305_sleep(struct dvb_frontend *fe)
        return 0;
 }
 
-static int lgdt3304_init(struct dvb_frontend *fe)
+static int lgdt3305_init(struct dvb_frontend *fe)
 {
        struct lgdt3305_state *state = fe->demodulator_priv;
        int ret;
 
        static struct lgdt3305_reg lgdt3304_init_data[] = {
-               { .reg = LGDT3305_GEN_CTRL_1,     .val = 0x03, },
-               { .reg = 0x000d,                  .val = 0x02, },
-               { .reg = 0x000e,                  .val = 0x02, },
-               { .reg = LGDT3305_DGTL_AGC_REF_1, .val = 0x32, },
-               { .reg = LGDT3305_DGTL_AGC_REF_2, .val = 0xc4, },
-               { .reg = LGDT3305_CR_CTR_FREQ_1,  .val = 0x00, },
-               { .reg = LGDT3305_CR_CTR_FREQ_2,  .val = 0x00, },
-               { .reg = LGDT3305_CR_CTR_FREQ_3,  .val = 0x00, },
-               { .reg = LGDT3305_CR_CTR_FREQ_4,  .val = 0x00, },
-               { .reg = LGDT3305_CR_CTRL_7,      .val = 0xf9, },
-               { .reg = 0x0112,                  .val = 0x17, },
-               { .reg = 0x0113,                  .val = 0x15, },
-               { .reg = 0x0114,                  .val = 0x18, },
-               { .reg = 0x0115,                  .val = 0xff, },
-               { .reg = 0x0116,                  .val = 0x3c, },
-               { .reg = 0x0214,                  .val = 0x67, },
-               { .reg = 0x0424,                  .val = 0x8d, },
-               { .reg = 0x0427,                  .val = 0x12, },
-               { .reg = 0x0428,                  .val = 0x4f, },
-               { .reg = LGDT3305_IFBW_1,         .val = 0x80, },
-               { .reg = LGDT3305_IFBW_2,         .val = 0x00, },
-               { .reg = 0x030a,                  .val = 0x08, },
-               { .reg = 0x030b,                  .val = 0x9b, },
-               { .reg = 0x030d,                  .val = 0x00, },
-               { .reg = 0x030e,                  .val = 0x1c, },
-               { .reg = 0x0314,                  .val = 0xe1, },
-               { .reg = 0x000d,                  .val = 0x82, },
-               { .reg = LGDT3305_TP_CTRL_1,      .val = 0x5b, },
-               { .reg = LGDT3305_TP_CTRL_1,      .val = 0x5b, },
+               { .reg = LGDT3305_GEN_CTRL_1,           .val = 0x03, },
+               { .reg = 0x000d,                        .val = 0x02, },
+               { .reg = 0x000e,                        .val = 0x02, },
+               { .reg = LGDT3305_DGTL_AGC_REF_1,       .val = 0x32, },
+               { .reg = LGDT3305_DGTL_AGC_REF_2,       .val = 0xc4, },
+               { .reg = LGDT3305_CR_CTR_FREQ_1,        .val = 0x00, },
+               { .reg = LGDT3305_CR_CTR_FREQ_2,        .val = 0x00, },
+               { .reg = LGDT3305_CR_CTR_FREQ_3,        .val = 0x00, },
+               { .reg = LGDT3305_CR_CTR_FREQ_4,        .val = 0x00, },
+               { .reg = LGDT3305_CR_CTRL_7,            .val = 0xf9, },
+               { .reg = 0x0112,                        .val = 0x17, },
+               { .reg = 0x0113,                        .val = 0x15, },
+               { .reg = 0x0114,                        .val = 0x18, },
+               { .reg = 0x0115,                        .val = 0xff, },
+               { .reg = 0x0116,                        .val = 0x3c, },
+               { .reg = 0x0214,                        .val = 0x67, },
+               { .reg = 0x0424,                        .val = 0x8d, },
+               { .reg = 0x0427,                        .val = 0x12, },
+               { .reg = 0x0428,                        .val = 0x4f, },
+               { .reg = LGDT3305_IFBW_1,               .val = 0x80, },
+               { .reg = LGDT3305_IFBW_2,               .val = 0x00, },
+               { .reg = 0x030a,                        .val = 0x08, },
+               { .reg = 0x030b,                        .val = 0x9b, },
+               { .reg = 0x030d,                        .val = 0x00, },
+               { .reg = 0x030e,                        .val = 0x1c, },
+               { .reg = 0x0314,                        .val = 0xe1, },
+               { .reg = 0x000d,                        .val = 0x82, },
+               { .reg = LGDT3305_TP_CTRL_1,            .val = 0x5b, },
+               { .reg = LGDT3305_TP_CTRL_1,            .val = 0x5b, },
        };
 
-       lg_dbg("\n");
-
-       ret = lgdt3305_write_regs(state, lgdt3304_init_data,
-                                 ARRAY_SIZE(lgdt3304_init_data));
-       if (lg_fail(ret))
-               goto fail;
-
-       ret = lgdt3305_soft_reset(state);
-fail:
-       return ret;
-}
-
-static int lgdt3305_init(struct dvb_frontend *fe)
-{
-       struct lgdt3305_state *state = fe->demodulator_priv;
-       int ret;
-
        static struct lgdt3305_reg lgdt3305_init_data[] = {
-               { .reg = LGDT3305_GEN_CTRL_1,
-                 .val = 0x03, },
-               { .reg = LGDT3305_GEN_CTRL_2,
-                 .val = 0xb0, },
-               { .reg = LGDT3305_GEN_CTRL_3,
-                 .val = 0x01, },
-               { .reg = LGDT3305_GEN_CONTROL,
-                 .val = 0x6f, },
-               { .reg = LGDT3305_GEN_CTRL_4,
-                 .val = 0x03, },
-               { .reg = LGDT3305_DGTL_AGC_REF_1,
-                 .val = 0x32, },
-               { .reg = LGDT3305_DGTL_AGC_REF_2,
-                 .val = 0xc4, },
-               { .reg = LGDT3305_CR_CTR_FREQ_1,
-                 .val = 0x00, },
-               { .reg = LGDT3305_CR_CTR_FREQ_2,
-                 .val = 0x00, },
-               { .reg = LGDT3305_CR_CTR_FREQ_3,
-                 .val = 0x00, },
-               { .reg = LGDT3305_CR_CTR_FREQ_4,
-                 .val = 0x00, },
-               { .reg = LGDT3305_CR_CTRL_7,
-                 .val = 0x79, },
-               { .reg = LGDT3305_AGC_POWER_REF_1,
-                 .val = 0x32, },
-               { .reg = LGDT3305_AGC_POWER_REF_2,
-                 .val = 0xc4, },
-               { .reg = LGDT3305_AGC_DELAY_PT_1,
-                 .val = 0x0d, },
-               { .reg = LGDT3305_AGC_DELAY_PT_2,
-                 .val = 0x30, },
-               { .reg = LGDT3305_RFAGC_LOOP_FLTR_BW_1,
-                 .val = 0x80, },
-               { .reg = LGDT3305_RFAGC_LOOP_FLTR_BW_2,
-                 .val = 0x00, },
-               { .reg = LGDT3305_IFBW_1,
-                 .val = 0x80, },
-               { .reg = LGDT3305_IFBW_2,
-                 .val = 0x00, },
-               { .reg = LGDT3305_AGC_CTRL_1,
-                 .val = 0x30, },
-               { .reg = LGDT3305_AGC_CTRL_4,
-                 .val = 0x61, },
-               { .reg = LGDT3305_FEC_BLOCK_CTRL,
-                 .val = 0xff, },
-               { .reg = LGDT3305_TP_CTRL_1,
-                 .val = 0x1b, },
+               { .reg = LGDT3305_GEN_CTRL_1,           .val = 0x03, },
+               { .reg = LGDT3305_GEN_CTRL_2,           .val = 0xb0, },
+               { .reg = LGDT3305_GEN_CTRL_3,           .val = 0x01, },
+               { .reg = LGDT3305_GEN_CONTROL,          .val = 0x6f, },
+               { .reg = LGDT3305_GEN_CTRL_4,           .val = 0x03, },
+               { .reg = LGDT3305_DGTL_AGC_REF_1,       .val = 0x32, },
+               { .reg = LGDT3305_DGTL_AGC_REF_2,       .val = 0xc4, },
+               { .reg = LGDT3305_CR_CTR_FREQ_1,        .val = 0x00, },
+               { .reg = LGDT3305_CR_CTR_FREQ_2,        .val = 0x00, },
+               { .reg = LGDT3305_CR_CTR_FREQ_3,        .val = 0x00, },
+               { .reg = LGDT3305_CR_CTR_FREQ_4,        .val = 0x00, },
+               { .reg = LGDT3305_CR_CTRL_7,            .val = 0x79, },
+               { .reg = LGDT3305_AGC_POWER_REF_1,      .val = 0x32, },
+               { .reg = LGDT3305_AGC_POWER_REF_2,      .val = 0xc4, },
+               { .reg = LGDT3305_AGC_DELAY_PT_1,       .val = 0x0d, },
+               { .reg = LGDT3305_AGC_DELAY_PT_2,       .val = 0x30, },
+               { .reg = LGDT3305_RFAGC_LOOP_FLTR_BW_1, .val = 0x80, },
+               { .reg = LGDT3305_RFAGC_LOOP_FLTR_BW_2, .val = 0x00, },
+               { .reg = LGDT3305_IFBW_1,               .val = 0x80, },
+               { .reg = LGDT3305_IFBW_2,               .val = 0x00, },
+               { .reg = LGDT3305_AGC_CTRL_1,           .val = 0x30, },
+               { .reg = LGDT3305_AGC_CTRL_4,           .val = 0x61, },
+               { .reg = LGDT3305_FEC_BLOCK_CTRL,       .val = 0xff, },
+               { .reg = LGDT3305_TP_CTRL_1,            .val = 0x1b, },
        };
 
        lg_dbg("\n");
 
-       ret = lgdt3305_write_regs(state, lgdt3305_init_data,
-                                 ARRAY_SIZE(lgdt3305_init_data));
+       switch (state->cfg->demod_chip) {
+       case LGDT3304:
+               ret = lgdt3305_write_regs(state, lgdt3304_init_data,
+                                         ARRAY_SIZE(lgdt3304_init_data));
+               break;
+       case LGDT3305:
+               ret = lgdt3305_write_regs(state, lgdt3305_init_data,
+                                         ARRAY_SIZE(lgdt3305_init_data));
+               break;
+       default:
+               ret = -EINVAL;
+       }
        if (lg_fail(ret))
                goto fail;
 
@@ -1198,7 +1167,7 @@ static struct dvb_frontend_ops lgdt3304_ops = {
                .caps = FE_CAN_QAM_64 | FE_CAN_QAM_256 | FE_CAN_8VSB
        },
        .i2c_gate_ctrl        = lgdt3305_i2c_gate_ctrl,
-       .init                 = lgdt3304_init,
+       .init                 = lgdt3305_init,
        .set_frontend         = lgdt3304_set_parameters,
        .get_frontend         = lgdt3305_get_frontend,
        .get_tune_settings    = lgdt3305_get_tune_settings,