[media] si2157: Add support for Si2147-A30 tuner

[cascardo/linux.git] / drivers / media / tuners / si2157.c

diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c
index efb5cce..cf97142 100644 (file)
--- a/drivers/media/tuners/si2157.c
+++ b/drivers/media/tuners/si2157.c
@@ -1,5 +1,5 @@
 /*
- * Silicon Labs Si2157/2158 silicon tuner driver
+ * Silicon Labs Si2147/2157/2158 silicon tuner driver
  *
  * Copyright (C) 2014 Antti Palosaari <crope@iki.fi>
  *
@@ -89,7 +89,10 @@ static int si2157_init(struct dvb_frontend *fe)
 
        dev_dbg(&s->client->dev, "\n");
 
-       /* configure? */
+       if (s->fw_loaded)
+               goto warm;
+
+       /* power up */
        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;
@@ -110,12 +113,14 @@ static int si2157_init(struct dvb_frontend *fe)
 
        #define SI2158_A20 ('A' << 24 | 58 << 16 | '2' << 8 | '0' << 0)
        #define SI2157_A30 ('A' << 24 | 57 << 16 | '3' << 8 | '0' << 0)
+       #define SI2147_A30 ('A' << 24 | 47 << 16 | '3' << 8 | '0' << 0)
 
        switch (chip_id) {
        case SI2158_A20:
                fw_file = SI2158_A20_FIRMWARE;
                break;
        case SI2157_A30:
+       case SI2147_A30:
                goto skip_fw_download;
                break;
        default:
@@ -176,9 +181,12 @@ skip_fw_download:
        if (ret)
                goto err;
 
-       s->active = true;
+       s->fw_loaded = true;
 
+warm:
+       s->active = true;
        return 0;
+
 err:
        if (fw)
                release_firmware(fw);
@@ -197,9 +205,10 @@ static int si2157_sleep(struct dvb_frontend *fe)
 
        s->active = false;
 
-       memcpy(cmd.args, "\x13", 1);
-       cmd.wlen = 1;
-       cmd.rlen = 0;
+       /* standby */
+       memcpy(cmd.args, "\x16\x00", 2);
+       cmd.wlen = 2;
+       cmd.rlen = 1;
        ret = si2157_cmd_execute(s, &cmd);
        if (ret)
                goto err;
@@ -258,7 +267,14 @@ static int si2157_set_params(struct dvb_frontend *fe)
        if (s->inversion)
                cmd.args[5] = 0x01;
        cmd.wlen = 6;
-       cmd.rlen = 1;
+       cmd.rlen = 4;
+       ret = si2157_cmd_execute(s, &cmd);
+       if (ret)
+               goto err;
+
+       memcpy(cmd.args, "\x14\x00\x02\x07\x01\x00", 6);
+       cmd.wlen = 6;
+       cmd.rlen = 4;
        ret = si2157_cmd_execute(s, &cmd);
        if (ret)
                goto err;
@@ -319,6 +335,7 @@ static int si2157_probe(struct i2c_client *client,
        s->client = client;
        s->fe = cfg->fe;
        s->inversion = cfg->inversion;
+       s->fw_loaded = false;
        mutex_init(&s->i2c_mutex);
 
        /* check if the tuner is there */