[PATCH 1/1] Test Mauros timing patch.

[Gon Solo]

Signed-off-by: Gon Solo <gons...@gmail.com>
---
 drivers/media/tuners/si2157.c         | 32 ++++++++++++++++-----------
 drivers/media/usb/dvb-usb-v2/af9035.c | 14 ++++++++----
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c
index d389f1fc237a..9e20727b7e84 100644
--- a/drivers/media/tuners/si2157.c
+++ b/drivers/media/tuners/si2157.c
@@ -75,6 +75,24 @@ static int si2157_cmd_execute(struct i2c_client *client, 
struct si2157_cmd *cmd)
        return ret;
 }
 
+static int si2157_power_up(struct si2157_dev *dev, struct i2c_client *client)
+{
+       struct si2157_cmd cmd;
+
+       if (dev->chiptype == SI2157_CHIPTYPE_SI2146) {
+               memcpy(cmd.args, "\xc0\x05\x01\x00\x00\x0b\x00\x00\x01", 9);
+               cmd.wlen = 9;
+       } else if (dev->chiptype == SI2157_CHIPTYPE_SI2141) {
+               memcpy(cmd.args, "\xc0\x00\x0d\x0e\x00\x01\x01\x01\x01\x03", 
10);
+               cmd.wlen = 10;
+       } else {
+               memcpy(cmd.args, 
"\xc0\x00\x0c\x00\x00\x01\x01\x01\x01\x01\x01\x02\x00\x00\x01", 15);
+               cmd.wlen = 15;
+       }
+       cmd.rlen = 1;
+       return si2157_cmd_execute(client, &cmd);
+}
+
 static int si2157_init(struct dvb_frontend *fe)
 {
        struct i2c_client *client = fe->tuner_priv;
@@ -102,19 +120,7 @@ static int si2157_init(struct dvb_frontend *fe)
        if (uitmp == dev->if_frequency / 1000)
                goto warm;
 
-       /* power up */
-       if (dev->chiptype == SI2157_CHIPTYPE_SI2146) {
-               memcpy(cmd.args, "\xc0\x05\x01\x00\x00\x0b\x00\x00\x01", 9);
-               cmd.wlen = 9;
-       } else if (dev->chiptype == SI2157_CHIPTYPE_SI2141) {
-               memcpy(cmd.args, "\xc0\x00\x0d\x0e\x00\x01\x01\x01\x01\x03", 
10);
-               cmd.wlen = 10;
-       } else {
-               memcpy(cmd.args, 
"\xc0\x00\x0c\x00\x00\x01\x01\x01\x01\x01\x01\x02\x00\x00\x01", 15);
-               cmd.wlen = 15;
-       }
-       cmd.rlen = 1;
-       ret = si2157_cmd_execute(client, &cmd);
+       ret = si2157_power_up(dev, client);
        if (ret)
                goto err;
 
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c 
b/drivers/media/usb/dvb-usb-v2/af9035.c
index 80d3bd3a0f24..c4d4994e0079 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.c
+++ b/drivers/media/usb/dvb-usb-v2/af9035.c
@@ -1207,6 +1207,9 @@ static int af9035_frontend_attach(struct dvb_usb_adapter 
*adap)
        return ret;
 }
 
+/* I2C speed register = (1000000000 / (24.4 * 16 * I2C_speed)) */
+#define I2C_SPEED_REGISTER 26
+
 static int it930x_frontend_attach(struct dvb_usb_adapter *adap)
 {
        struct state *state = adap_to_priv(adap);
@@ -1575,13 +1578,13 @@ 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);
+       /* I2C master bus 2 clock speed ~100k */
+       ret = af9035_wr_reg(d, 0x00f6a7, I2C_SPEED_REGISTER);
        if (ret < 0)
                goto err;
 
-       /* I2C master bus 1,3 clock speed 300k */
-       ret = af9035_wr_reg(d, 0x00f103, 0x07);
+       /* I2C master bus 1,3 clock speed ~100k */
+       ret = af9035_wr_reg(d, 0x00f103, I2C_SPEED_REGISTER);
        if (ret < 0)
                goto err;
 
@@ -2128,6 +2131,9 @@ static const struct usb_device_id af9035_id_table[] = {
        /* IT930x devices */
        { DVB_USB_DEVICE(USB_VID_ITETECH, USB_PID_ITETECH_IT9303,
                &it930x_props, "ITE 9303 Generic", NULL) },
+
+       { DVB_USB_DEVICE(USB_VID_DEXATEK, 0x0100,
+               &it930x_props, "Logilink VG0022A", NULL) },
        { }
 };
 MODULE_DEVICE_TABLE(usb, af9035_id_table);
-- 
2.20.1