media: dvb: init i2c already in it930x_frontend_attach

i2c bus is already needed when the frontend is probed, so init it already
in it930x_frontend_attach. That prevents errors like:

si2168: probe of 6-0067 failed with error -5

Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
Signed-off-by: Jose Alberto Reguero <jose.alberto.reguero@gmail.com>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c
index 80d3bd3a0f245786b69800dcbfaabf7f6d430c1e..e8ec53249db077602f7cea2a99a6549fb939e343 100644 (file)
--- a/drivers/media/usb/dvb-usb-v2/af9035.c
+++ b/drivers/media/usb/dvb-usb-v2/af9035.c
@@ -1218,6 +1218,48 @@ static int it930x_frontend_attach(struct dvb_usb_adapter *adap)
 
        dev_dbg(&intf->dev, "adap->id=%d\n", adap->id);
 
+       /* I2C master bus 2 clock speed 300k */
+       ret = af9035_wr_reg(d, 0x00f6a7, 0x07);
+       if (ret < 0)
+               goto err;
+
+       /* I2C master bus 1,3 clock speed 300k */
+       ret = af9035_wr_reg(d, 0x00f103, 0x07);
+       if (ret < 0)
+               goto err;
+
+       /* set gpio11 low */
+       ret = af9035_wr_reg_mask(d, 0xd8d4, 0x01, 0x01);
+       if (ret < 0)
+               goto err;
+
+       ret = af9035_wr_reg_mask(d, 0xd8d5, 0x01, 0x01);
+       if (ret < 0)
+               goto err;
+
+       ret = af9035_wr_reg_mask(d, 0xd8d3, 0x01, 0x01);
+       if (ret < 0)
+               goto err;
+
+       /* Tuner enable using gpiot2_en, gpiot2_on and gpiot2_o (reset) */
+       ret = af9035_wr_reg_mask(d, 0xd8b8, 0x01, 0x01);
+       if (ret < 0)
+               goto err;
+
+       ret = af9035_wr_reg_mask(d, 0xd8b9, 0x01, 0x01);
+       if (ret < 0)
+               goto err;
+
+       ret = af9035_wr_reg_mask(d, 0xd8b7, 0x00, 0x01);
+       if (ret < 0)
+               goto err;
+
+       msleep(200);
+
+       ret = af9035_wr_reg_mask(d, 0xd8b7, 0x01, 0x01);
+       if (ret < 0)
+               goto err;
+
        memset(&si2168_config, 0, sizeof(si2168_config));
        si2168_config.i2c_adapter = &adapter;
        si2168_config.fe = &adap->fe[0];
@@ -1575,48 +1617,6 @@ static int it930x_tuner_attach(struct dvb_usb_adapter *adap)
 
        dev_dbg(&intf->dev, "adap->id=%d\n", adap->id);
 
-       /* I2C master bus 2 clock speed 300k */
-       ret = af9035_wr_reg(d, 0x00f6a7, 0x07);
-       if (ret < 0)
-               goto err;
-
-       /* I2C master bus 1,3 clock speed 300k */
-       ret = af9035_wr_reg(d, 0x00f103, 0x07);
-       if (ret < 0)
-               goto err;
-
-       /* set gpio11 low */
-       ret = af9035_wr_reg_mask(d, 0xd8d4, 0x01, 0x01);
-       if (ret < 0)
-               goto err;
-
-       ret = af9035_wr_reg_mask(d, 0xd8d5, 0x01, 0x01);
-       if (ret < 0)
-               goto err;
-
-       ret = af9035_wr_reg_mask(d, 0xd8d3, 0x01, 0x01);
-       if (ret < 0)
-               goto err;
-
-       /* Tuner enable using gpiot2_en, gpiot2_on and gpiot2_o (reset) */
-       ret = af9035_wr_reg_mask(d, 0xd8b8, 0x01, 0x01);
-       if (ret < 0)
-               goto err;
-
-       ret = af9035_wr_reg_mask(d, 0xd8b9, 0x01, 0x01);
-       if (ret < 0)
-               goto err;
-
-       ret = af9035_wr_reg_mask(d, 0xd8b7, 0x00, 0x01);
-       if (ret < 0)
-               goto err;
-
-       msleep(200);
-
-       ret = af9035_wr_reg_mask(d, 0xd8b7, 0x01, 0x01);
-       if (ret < 0)
-               goto err;
-
        memset(&si2157_config, 0, sizeof(si2157_config));
        si2157_config.fe = adap->fe[0];
        si2157_config.if_port = 1;