Merge tag 'metag-v3.9-rc1-v4' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan...

[mirror_ubuntu-artful-kernel.git] / drivers / media / dvb-frontends / af9033.c

diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c
index 464ad878490bb5026dcd5a2ffd9ae95004c17366..c9cad989b8b93139a6a83702a511fb4ae3623c5c 100644 (file)
--- a/drivers/media/dvb-frontends/af9033.c
+++ b/drivers/media/dvb-frontends/af9033.c
@@ -318,6 +318,10 @@ static int af9033_init(struct dvb_frontend *fe)
                len = ARRAY_SIZE(tuner_init_fc2580);
                init = tuner_init_fc2580;
                break;
+       case AF9033_TUNER_FC0012:
+               len = ARRAY_SIZE(tuner_init_fc0012);
+               init = tuner_init_fc0012;
+               break;
        default:
                dev_dbg(&state->i2c->dev, "%s: unsupported tuner ID=%d\n",
                                __func__, state->cfg.tuner);
@@ -331,6 +335,20 @@ static int af9033_init(struct dvb_frontend *fe)
                        goto err;
        }
 
+       if (state->cfg.ts_mode == AF9033_TS_MODE_SERIAL) {
+               ret = af9033_wr_reg_mask(state, 0x00d91c, 0x01, 0x01);
+               if (ret < 0)
+                       goto err;
+
+               ret = af9033_wr_reg_mask(state, 0x00d917, 0x00, 0x01);
+               if (ret < 0)
+                       goto err;
+
+               ret = af9033_wr_reg_mask(state, 0x00d916, 0x00, 0x01);
+               if (ret < 0)
+                       goto err;
+       }
+
        state->bandwidth_hz = 0; /* force to program all parameters */
 
        return 0;