diff options
author | Antti Palosaari <crope@iki.fi> | 2013-03-07 20:18:56 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-21 18:05:24 -0400 |
commit | 086991dd106bda1c43a294a874563322e0d777e4 (patch) | |
tree | fbd4c78a71d5aee2c58625d75d1cbe22e555f55a | |
parent | d423e108c1d6ced41964fafc97c02e4b5d0597a1 (diff) |
[media] af9033: move code from it913x to af9033
That register is property of demodulator so move it correct place.
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/dvb-frontends/af9033.c | 9 | ||||
-rw-r--r-- | drivers/media/tuners/it913x.c | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c index 032074708d73..8e3a99d2b4bf 100644 --- a/drivers/media/dvb-frontends/af9033.c +++ b/drivers/media/dvb-frontends/af9033.c | |||
@@ -391,6 +391,15 @@ static int af9033_init(struct dvb_frontend *fe) | |||
391 | goto err; | 391 | goto err; |
392 | } | 392 | } |
393 | 393 | ||
394 | switch (state->cfg.tuner) { | ||
395 | case AF9033_TUNER_IT9135_60: | ||
396 | case AF9033_TUNER_IT9135_61: | ||
397 | case AF9033_TUNER_IT9135_62: | ||
398 | ret = af9033_wr_reg(state, 0x800000, 0x01); | ||
399 | if (ret < 0) | ||
400 | goto err; | ||
401 | } | ||
402 | |||
394 | state->bandwidth_hz = 0; /* force to program all parameters */ | 403 | state->bandwidth_hz = 0; /* force to program all parameters */ |
395 | 404 | ||
396 | return 0; | 405 | return 0; |
diff --git a/drivers/media/tuners/it913x.c b/drivers/media/tuners/it913x.c index 2c60bf77ebfc..4d7a24761050 100644 --- a/drivers/media/tuners/it913x.c +++ b/drivers/media/tuners/it913x.c | |||
@@ -145,12 +145,6 @@ static int it913x_init(struct dvb_frontend *fe) | |||
145 | u8 nv[] = {48, 32, 24, 16, 12, 8, 6, 4, 2}; | 145 | u8 nv[] = {48, 32, 24, 16, 12, 8, 6, 4, 2}; |
146 | u8 b[2]; | 146 | u8 b[2]; |
147 | 147 | ||
148 | if (state->chip_ver == 2) { | ||
149 | ret = it913x_wr_reg(state, PRO_DMOD, TRIGGER_OFSM, 0x1); | ||
150 | if (ret < 0) | ||
151 | return -ENODEV; | ||
152 | } | ||
153 | |||
154 | reg = it913x_rd_reg(state, 0xec86); | 148 | reg = it913x_rd_reg(state, 0xec86); |
155 | switch (reg) { | 149 | switch (reg) { |
156 | case 0: | 150 | case 0: |