hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[media] si2168: few firmware download changes 

Rework firmware selection logic a little bit.
Print notice asking user update firmware when old Si2168 B40
firmware is used.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Tested-by: Olli Salonen <olli.salonen@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Antti Palosaari 2014-07-13 19:22:19 -03:00 committed by Mauro Carvalho Chehab
parent bac53a2c60
commit b6b6fd6feb
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/media/dvb-frontends/si2168.c
View File

@ -336,6 +336,7 @@ static int si2168_init(struct dvb_frontend *fe)
u8 *fw_file; u8 *fw_file;
const unsigned int i2c_wr_max = 8; const unsigned int i2c_wr_max = 8;
struct si2168_cmd cmd; struct si2168_cmd cmd;
unsigned int chip_id;
dev_dbg(&s->client->dev, "%s:\n", __func__); dev_dbg(&s->client->dev, "%s:\n", __func__);
@ -375,16 +376,24 @@ static int si2168_init(struct dvb_frontend *fe)
if (ret) if (ret)
goto err; goto err;
if (((cmd.args[1] & 0x0f) == 2) && (cmd.args[3] == '4') && chip_id = cmd.args[1] << 24 | cmd.args[2] << 16 | cmd.args[3] << 8 |
(cmd.args[4] == '0')) cmd.args[4] << 0;
fw_file = SI2168_B40_FIRMWARE;
else if (((cmd.args[1] & 0x0f) == 1) && (cmd.args[3] == '3') && #define SI2168_A30 ('A' << 24 | 68 << 16 | '3' << 8 | '0' << 0)
(cmd.args[4] == '0')) #define SI2168_B40 ('B' << 24 | 68 << 16 | '4' << 8 | '0' << 0)
switch (chip_id) {
case SI2168_A30:
fw_file = SI2168_A30_FIRMWARE; fw_file = SI2168_A30_FIRMWARE;
else { break;
case SI2168_B40:
fw_file = SI2168_B40_FIRMWARE;
break;
default:
dev_err(&s->client->dev, dev_err(&s->client->dev,
"%s: no firmware file for Si2168-%c%c defined\n", "%s: unkown chip version Si21%d-%c%c%c\n",
KBUILD_MODNAME, cmd.args[3], cmd.args[4]); KBUILD_MODNAME, cmd.args[2], cmd.args[1],
cmd.args[3], cmd.args[4]);
ret = -EINVAL; ret = -EINVAL;
goto err; goto err;
} }
@ -396,15 +405,19 @@ static int si2168_init(struct dvb_frontend *fe)
/* request the firmware, this will block and timeout */ /* request the firmware, this will block and timeout */
ret = request_firmware(&fw, fw_file, &s->client->dev); ret = request_firmware(&fw, fw_file, &s->client->dev);
if (ret) { if (ret) {
/* fallback mechanism to handle old name for /* fallback mechanism to handle old name for Si2168 B40 fw */
SI2168_B40_FIRMWARE */ if (chip_id == SI2168_B40) {
if (((cmd.args[1] & 0x0f) == 2) && (cmd.args[3] == '4') &&
(cmd.args[4] == '0')) {
fw_file = SI2168_B40_FIRMWARE_FALLBACK; fw_file = SI2168_B40_FIRMWARE_FALLBACK;
ret = request_firmware(&fw, fw_file, &s->client->dev); ret = request_firmware(&fw, fw_file, &s->client->dev);
} }
if (ret) {
dev_err(&s->client->dev, "%s: firmware file '%s' not found\n", if (ret == 0) {
dev_notice(&s->client->dev,
"%s: please install firmware file '%s'\n",
KBUILD_MODNAME, SI2168_B40_FIRMWARE);
} else {
dev_err(&s->client->dev,
"%s: firmware file '%s' not found\n",
KBUILD_MODNAME, fw_file); KBUILD_MODNAME, fw_file);
goto err; goto err;
} }