From: Antti Palosaari <crope@iki.fi>
Date: Fri, 8 Mar 2013 01:18:56 +0000 (-0300)
Subject: [media] af9033: move code from it913x to af9033
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=086991dd106bda1c43a294a874563322e0d777e4;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

[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>
---

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)
 			goto err;
 	}
 
+	switch (state->cfg.tuner) {
+	case AF9033_TUNER_IT9135_60:
+	case AF9033_TUNER_IT9135_61:
+	case AF9033_TUNER_IT9135_62:
+		ret = af9033_wr_reg(state, 0x800000, 0x01);
+		if (ret < 0)
+			goto err;
+	}
+
 	state->bandwidth_hz = 0; /* force to program all parameters */
 
 	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)
 	u8 nv[] = {48, 32, 24, 16, 12, 8, 6, 4, 2};
 	u8 b[2];
 
-	if (state->chip_ver == 2) {
-		ret = it913x_wr_reg(state, PRO_DMOD, TRIGGER_OFSM, 0x1);
-		if (ret < 0)
-			return -ENODEV;
-	}
-
 	reg = it913x_rd_reg(state, 0xec86);
 	switch (reg) {
 	case 0: