diff options
| author | Olli Salonen <olli.salonen@iki.fi> | 2014-07-13 10:52:18 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-14 21:07:05 -0300 |
| commit | c9cb0820d5d756f2fac550213e664cc0be511349 (patch) | |
| tree | 7d118af85c060726ec755bd2ca1b6d35e93a48ec /drivers/media/dvb-frontends | |
| parent | b02db9e1e01253e375e8b760c22858027a2130de (diff) | |
[media] si2168: Add support for chip revision Si2168 A30
Add handling for different chip revisions and firmwares.
Signed-off-by: Olli Salonen <olli.salonen@iki.fi>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/dvb-frontends')
| -rw-r--r-- | drivers/media/dvb-frontends/si2168.c | 34 | ||||
| -rw-r--r-- | drivers/media/dvb-frontends/si2168_priv.h | 4 |
2 files changed, 32 insertions, 6 deletions
diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c index 5481c39594c4..c10f4a1c6157 100644 --- a/drivers/media/dvb-frontends/si2168.c +++ b/drivers/media/dvb-frontends/si2168.c @@ -333,7 +333,7 @@ static int si2168_init(struct dvb_frontend *fe) struct si2168 *s = fe->demodulator_priv; int ret, len, remaining; const struct firmware *fw = NULL; - u8 *fw_file = SI2168_FIRMWARE; + u8 *fw_file; const unsigned int i2c_wr_max = 8; struct si2168_cmd cmd; @@ -353,6 +353,7 @@ static int si2168_init(struct dvb_frontend *fe) if (ret) goto err; + /* query chip revision */ memcpy(cmd.args, "\x02", 1); cmd.wlen = 1; cmd.rlen = 13; @@ -374,6 +375,20 @@ static int si2168_init(struct dvb_frontend *fe) if (ret) goto err; + if (((cmd.args[1] & 0x0f) == 2) && (cmd.args[3] == '4') && + (cmd.args[4] == '0')) + fw_file = SI2168_B40_FIRMWARE; + else if (((cmd.args[1] & 0x0f) == 1) && (cmd.args[3] == '3') && + (cmd.args[4] == '0')) + fw_file = SI2168_A30_FIRMWARE; + else { + dev_err(&s->client->dev, + "%s: no firmware file for Si2168-%c%c defined\n", + KBUILD_MODNAME, cmd.args[3], cmd.args[4]); + ret = -EINVAL; + goto err; + } + /* cold state - try to download firmware */ dev_info(&s->client->dev, "%s: found a '%s' in cold state\n", KBUILD_MODNAME, si2168_ops.info.name); @@ -381,9 +396,18 @@ static int si2168_init(struct dvb_frontend *fe) /* request the firmware, this will block and timeout */ ret = request_firmware(&fw, fw_file, &s->client->dev); if (ret) { - dev_err(&s->client->dev, "%s: firmare file '%s' not found\n", - KBUILD_MODNAME, fw_file); - goto err; + /* fallback mechanism to handle old name for + SI2168_B40_FIRMWARE */ + if (((cmd.args[1] & 0x0f) == 2) && (cmd.args[3] == '4') && + (cmd.args[4] == '0')) { + fw_file = SI2168_B40_FIRMWARE_FALLBACK; + ret = request_firmware(&fw, fw_file, &s->client->dev); + } + if (ret) { + dev_err(&s->client->dev, "%s: firmware file '%s' not found\n", + KBUILD_MODNAME, fw_file); + goto err; + } } dev_info(&s->client->dev, "%s: downloading firmware from file '%s'\n", @@ -643,4 +667,4 @@ module_i2c_driver(si2168_driver); MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>"); MODULE_DESCRIPTION("Silicon Labs Si2168 DVB-T/T2/C demodulator driver"); MODULE_LICENSE("GPL"); -MODULE_FIRMWARE(SI2168_FIRMWARE); +MODULE_FIRMWARE(SI2168_B40_FIRMWARE); diff --git a/drivers/media/dvb-frontends/si2168_priv.h b/drivers/media/dvb-frontends/si2168_priv.h index e7d963dbaf34..d606915dea14 100644 --- a/drivers/media/dvb-frontends/si2168_priv.h +++ b/drivers/media/dvb-frontends/si2168_priv.h @@ -22,7 +22,9 @@ #include <linux/firmware.h> #include <linux/i2c-mux.h> -#define SI2168_FIRMWARE "dvb-demod-si2168-01.fw" +#define SI2168_A30_FIRMWARE "dvb-demod-si2168-a30-01.fw" +#define SI2168_B40_FIRMWARE "dvb-demod-si2168-b40-01.fw" +#define SI2168_B40_FIRMWARE_FALLBACK "dvb-demod-si2168-01.fw" /* state struct */ struct si2168 { |