aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2013-02-27 21:29:02 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-21 17:58:17 -0400
commitd19812eb5f1efed3fa0ba5d752da5f24d8c89701 (patch)
tree97d5e29b5b74f9b29ea8910271a587175808822d
parent42432b3ce89eaf817284f0c6ff81dfd7b4ed35b3 (diff)
[media] it913x: tuner power up routines
Copy forgotten power up registers from it913x-fe driver. Remove two demod registers as those are already written by af9033 driver. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/tuners/it913x.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/media/tuners/it913x.c b/drivers/media/tuners/it913x.c
index 82cc053bc998..de20da1548aa 100644
--- a/drivers/media/tuners/it913x.c
+++ b/drivers/media/tuners/it913x.c
@@ -192,11 +192,9 @@ static int it913x_init(struct dvb_frontend *fe)
192 192
193 if (state->config->chip_ver == 2) { 193 if (state->config->chip_ver == 2) {
194 ret = it913x_wr_reg(state, PRO_DMOD, TRIGGER_OFSM, 0x1); 194 ret = it913x_wr_reg(state, PRO_DMOD, TRIGGER_OFSM, 0x1);
195 ret |= it913x_wr_reg(state, PRO_LINK, PADODPU, 0x0); 195 if (ret < 0)
196 ret |= it913x_wr_reg(state, PRO_LINK, AGC_O_D, 0x0); 196 return -ENODEV;
197 } 197 }
198 if (ret < 0)
199 return -ENODEV;
200 198
201 reg = it913x_rd_reg(state, 0xec86); 199 reg = it913x_rd_reg(state, 0xec86);
202 switch (reg) { 200 switch (reg) {
@@ -252,6 +250,12 @@ static int it913x_init(struct dvb_frontend *fe)
252 } 250 }
253 } 251 }
254 252
253 /* Power Up Tuner - common all versions */
254 ret = it913x_wr_reg(state, PRO_DMOD, 0xec40, 0x1);
255 ret |= it913x_wr_reg(state, PRO_DMOD, 0xfba8, 0x0);
256 ret |= it913x_wr_reg(state, PRO_DMOD, 0xec57, 0x0);
257 ret |= it913x_wr_reg(state, PRO_DMOD, 0xec58, 0x0);
258
255 return it913x_wr_reg(state, PRO_DMOD, 0xed81, val); 259 return it913x_wr_reg(state, PRO_DMOD, 0xed81, val);
256} 260}
257 261