diff options
| -rw-r--r-- | drivers/media/tuners/si2157.c | 70 | ||||
| -rw-r--r-- | drivers/media/tuners/si2157_priv.h | 2 |
2 files changed, 6 insertions, 66 deletions
diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c index b46b14997ddd..57b250847cd3 100644 --- a/drivers/media/tuners/si2157.c +++ b/drivers/media/tuners/si2157.c @@ -1,5 +1,5 @@ /* - * Silicon Labs Si2141/2146/2147/2148/2151/2157/2158 silicon tuner driver + * Silicon Labs Si2146/2147/2148/2157/2158 silicon tuner driver * * Copyright (C) 2014 Antti Palosaari <crope@iki.fi> * @@ -75,7 +75,6 @@ err_mutex_unlock: return ret; } -#define MAX_RESET_ATTEMPTS 10 static int si2157_init(struct dvb_frontend *fe) { struct i2c_client *client = fe->tuner_priv; @@ -85,7 +84,7 @@ static int si2157_init(struct dvb_frontend *fe) struct si2157_cmd cmd; const struct firmware *fw; const char *fw_name; - unsigned int uitmp, chip_id, i; + unsigned int uitmp, chip_id; dev_dbg(&client->dev, "\n"); @@ -103,44 +102,14 @@ static int si2157_init(struct dvb_frontend *fe) if (uitmp == dev->if_frequency / 1000) goto warm; - if (dev->chiptype == SI2157_CHIPTYPE_SI2141) { - for (i = 0; i < MAX_RESET_ATTEMPTS; i++) { - /* reset */ - memcpy(cmd.args, "\xc0\x05\x00\x00", 4); - cmd.wlen = 4; - cmd.rlen = 1; - ret = si2157_cmd_execute(client, &cmd); - if (ret) - goto err; - - memcpy(cmd.args, "\xc0\x00\x0d\x0e\x00\x01\x01\x01\x01\x03", 10); - cmd.wlen = 10; - cmd.rlen = 1; - ret = si2157_cmd_execute(client, &cmd); - if (ret) - goto err; - if (cmd.args[0] != 0xfe) - break; - } - if (i >= MAX_RESET_ATTEMPTS) - goto err; - } - /* power up */ - switch (dev->chiptype) { - case SI2157_CHIPTYPE_SI2146: + if (dev->chiptype == SI2157_CHIPTYPE_SI2146) { memcpy(cmd.args, "\xc0\x05\x01\x00\x00\x0b\x00\x00\x01", 9); cmd.wlen = 9; - break; - case SI2157_CHIPTYPE_SI2141: - memcpy(cmd.args, "\xc0\x08\x01\x02\x00\x08\x01", 7); - cmd.wlen = 7; - break; - default: + } 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); if (ret) @@ -162,8 +131,6 @@ static int si2157_init(struct dvb_frontend *fe) #define SI2157_A30 ('A' << 24 | 57 << 16 | '3' << 8 | '0' << 0) #define SI2147_A30 ('A' << 24 | 47 << 16 | '3' << 8 | '0' << 0) #define SI2146_A10 ('A' << 24 | 46 << 16 | '1' << 8 | '0' << 0) - #define SI2141_A10 ('A' << 24 | 41 << 16 | '1' << 8 | '0' << 0) - #define SI2151_A10 ('A' << 24 | 51 << 16 | '1' << 8 | '0' << 0) switch (chip_id) { case SI2158_A20: @@ -175,10 +142,6 @@ static int si2157_init(struct dvb_frontend *fe) case SI2146_A10: fw_name = NULL; break; - case SI2141_A10: - case SI2151_A10: - fw_name = SI2141_A10_FIRMWARE; - break; default: dev_err(&client->dev, "unknown chip version Si21%d-%c%c%c\n", cmd.args[2], cmd.args[1], @@ -251,23 +214,6 @@ skip_fw_download: dev_info(&client->dev, "firmware version: %c.%c.%d\n", cmd.args[6], cmd.args[7], cmd.args[8]); - - if (dev->chiptype == SI2157_CHIPTYPE_SI2141) { - /* set clock */ - memcpy(cmd.args, "\xc0\x00\x0d", 3); - cmd.wlen = 3; - cmd.rlen = 1; - ret = si2157_cmd_execute(client, &cmd); - if (ret) - goto err; - /* setup PIN */ - memcpy(cmd.args, "\x12\x80\x80\x85\x00\x81\x00", 7); - cmd.wlen = 7; - cmd.rlen = 7; - ret = si2157_cmd_execute(client, &cmd); - if (ret) - goto err; - } warm: /* init statistics in order signal app which are supported */ c->strength.len = 1; @@ -525,8 +471,7 @@ static int si2157_probe(struct i2c_client *client, #endif dev_info(&client->dev, "Silicon Labs %s successfully attached\n", - dev->chiptype == SI2157_CHIPTYPE_SI2141 ? - "Si2141/2151" : dev->chiptype == SI2157_CHIPTYPE_SI2146 ? + dev->chiptype == SI2157_CHIPTYPE_SI2146 ? "Si2146" : "Si2147/2148/2157/2158"); return 0; @@ -563,8 +508,6 @@ static int si2157_remove(struct i2c_client *client) static const struct i2c_device_id si2157_id_table[] = { {"si2157", SI2157_CHIPTYPE_SI2157}, {"si2146", SI2157_CHIPTYPE_SI2146}, - {"si2141", SI2157_CHIPTYPE_SI2141}, - {"si2151", SI2157_CHIPTYPE_SI2141}, {} }; MODULE_DEVICE_TABLE(i2c, si2157_id_table); @@ -581,8 +524,7 @@ static struct i2c_driver si2157_driver = { module_i2c_driver(si2157_driver); -MODULE_DESCRIPTION("Silicon Labs Si2141/2146/2147/2148/2151/2157/2158 silicon tuner driver"); +MODULE_DESCRIPTION("Silicon Labs Si2146/2147/2148/2157/2158 silicon tuner driver"); MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>"); MODULE_LICENSE("GPL"); MODULE_FIRMWARE(SI2158_A20_FIRMWARE); -MODULE_FIRMWARE(SI2141_A10_FIRMWARE); diff --git a/drivers/media/tuners/si2157_priv.h b/drivers/media/tuners/si2157_priv.h index e6436f74abaa..d6b2c7b44053 100644 --- a/drivers/media/tuners/si2157_priv.h +++ b/drivers/media/tuners/si2157_priv.h @@ -42,7 +42,6 @@ struct si2157_dev { #define SI2157_CHIPTYPE_SI2157 0 #define SI2157_CHIPTYPE_SI2146 1 -#define SI2157_CHIPTYPE_SI2141 2 /* firmware command struct */ #define SI2157_ARGLEN 30 @@ -53,6 +52,5 @@ struct si2157_cmd { }; #define SI2158_A20_FIRMWARE "dvb-tuner-si2158-a20-01.fw" -#define SI2141_A10_FIRMWARE "dvb-tuner-si2141-a10-01.fw" #endif |