[media] af9033: move code from it913x to af9033
authorAntti Palosaari <crope@iki.fi>
Fri, 8 Mar 2013 01:18:56 +0000 (22:18 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 21 Mar 2013 22:05:24 +0000 (19:05 -0300)
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>
drivers/media/dvb-frontends/af9033.c
drivers/media/tuners/it913x.c

index 032074708d739d85a68a482eaf2d8993be707938..8e3a99d2b4bf2ebf3b04bf7deaa8ab0df52f3529 100644 (file)
@@ -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;
index 2c60bf77ebfce0d1ea5671cfc3e0cb270bd743a4..4d7a2476105033dd61eb31643f7f54b775ac8acd 100644 (file)
@@ -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: