[media] si2165: only write agc registers after reset before start_syncro
authorMatthias Schwarzott <zzam@gentoo.org>
Thu, 19 Nov 2015 20:03:56 +0000 (18:03 -0200)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Thu, 3 Dec 2015 14:06:16 +0000 (12:06 -0200)
Datasheet says they must be rewritten after reset.
But it only makes sense to write them when trying to tune afterwards.

Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/dvb-frontends/si2165.c

index 222d7750f98d17e364d3ecd5b573cc15c0369fbc..07247e307f5565f179d5e96091445e642fc46841 100644 (file)
@@ -690,23 +690,6 @@ static int si2165_init(struct dvb_frontend *fe)
                        goto error;
        }
 
-       /* write adc values after each reset*/
-       ret = si2165_writereg8(state, 0x012a, 0x46);
-       if (ret < 0)
-               goto error;
-       ret = si2165_writereg8(state, 0x012c, 0x00);
-       if (ret < 0)
-               goto error;
-       ret = si2165_writereg8(state, 0x012e, 0x0a);
-       if (ret < 0)
-               goto error;
-       ret = si2165_writereg8(state, 0x012f, 0xff);
-       if (ret < 0)
-               goto error;
-       ret = si2165_writereg8(state, 0x0123, 0x70);
-       if (ret < 0)
-               goto error;
-
        return 0;
 error:
        return ret;
@@ -788,6 +771,14 @@ static int si2165_set_if_freq_shift(struct si2165_state *state, u32 IF)
        return si2165_writereg32(state, 0x00e8, reg_value);
 }
 
+static const struct si2165_reg_value_pair agc_rewrite[] = {
+       { 0x012a, 0x46 },
+       { 0x012c, 0x00 },
+       { 0x012e, 0x0a },
+       { 0x012f, 0xff },
+       { 0x0123, 0x70 }
+};
+
 static int si2165_set_frontend(struct dvb_frontend *fe)
 {
        int ret;
@@ -924,6 +915,13 @@ static int si2165_set_frontend(struct dvb_frontend *fe)
        ret = si2165_writereg32(state, 0x0384, 0x00000000);
        if (ret < 0)
                return ret;
+
+       /* write adc values after each reset*/
+       ret = si2165_write_reg_list(state, agc_rewrite,
+                                   ARRAY_SIZE(agc_rewrite));
+       if (ret < 0)
+               return ret;
+
        /* start_synchro */
        ret = si2165_writereg8(state, 0x02e0, 0x01);
        if (ret < 0)