renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 21:54:06 +08:00
Code

media: af9015: refactor copy firmware to slave demod

Browse Source 
Small improvements.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Antti Palosaari 2017-06-26 07:15:27 -04:00 committed by Mauro Carvalho Chehab
parent 2ffb2fa32e
commit 0092293ec7
1 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
drivers/media/usb/dvb-usb-v2/af9015.c
View File

@ -720,79 +720,79 @@ static int af9015_copy_firmware(struct dvb_usb_device *d)
struct af9015_state *state = d_to_priv(d);
struct usb_interface *intf = d->intf;
int ret;
u8 fw_params[4];
u8 val, i;
struct req_t req = {COPY_FIRMWARE, 0, 0x5100, 0, 0, sizeof(fw_params),
fw_params };
unsigned long timeout;
u8 val, firmware_info[4];
struct req_t req = {COPY_FIRMWARE, 0, 0x5100, 0, 0, 4, firmware_info};
dev_dbg(&intf->dev, "\n");
fw_params[0] = state->firmware_size >> 8;
fw_params[1] = state->firmware_size & 0xff;
fw_params[2] = state->firmware_checksum >> 8;
fw_params[3] = state->firmware_checksum & 0xff;
firmware_info[0] = (state->firmware_size >> 8) & 0xff;
firmware_info[1] = (state->firmware_size >> 0) & 0xff;
firmware_info[2] = (state->firmware_checksum >> 8) & 0xff;
firmware_info[3] = (state->firmware_checksum >> 0) & 0xff;
ret = af9015_read_reg_i2c(d, state->af9013_i2c_addr[1],
0x98be, &val);
/* Check whether firmware is already running */
ret = af9015_read_reg_i2c(d, state->af9013_i2c_addr[1], 0x98be, &val);
if (ret)
goto error;
else
dev_dbg(&intf->dev, "firmware status %02x\n", val);
goto err;
if (val == 0x0c) /* fw is running, no need for download */
goto exit;
dev_dbg(&intf->dev, "firmware status %02x\n", val);
/* set I2C master clock to fast (to speed up firmware copy) */
ret = af9015_write_reg(d, 0xd416, 0x04); /* 0x04 * 400ns */
if (val == 0x0c)
return 0;
/* Set i2c clock to 625kHz to speed up firmware copy */
ret = af9015_write_reg(d, 0xd416, 0x04);
if (ret)
goto error;
goto err;
msleep(50);
/* copy firmware */
/* Copy firmware from master demod to slave demod */
ret = af9015_ctrl_msg(d, &req);
if (ret)
if (ret) {
dev_err(&intf->dev, "firmware copy cmd failed %d\n", ret);
dev_dbg(&intf->dev, "firmware copy done\n");
/* set I2C master clock back to normal */
ret = af9015_write_reg(d, 0xd416, 0x14); /* 0x14 * 400ns */
if (ret)
goto error;
/* request boot firmware */
ret = af9015_write_reg_i2c(d, state->af9013_i2c_addr[1],
0xe205, 1);
dev_dbg(&intf->dev, "firmware boot cmd status %d\n", ret);
if (ret)
goto error;
for (i = 0; i < 15; i++) {
msleep(100);
/* check firmware status */
ret = af9015_read_reg_i2c(d, state->af9013_i2c_addr[1],
0x98be, &val);
dev_dbg(&intf->dev, "firmware status cmd status %d, firmware status %02x\n",
ret, val);
if (ret)
goto error;
if (val == 0x0c || val == 0x04) /* success or fail */
break;
goto err;
}
/* Set i2c clock to 125kHz */
ret = af9015_write_reg(d, 0xd416, 0x14);
if (ret)
goto err;
/* Boot firmware */
ret = af9015_write_reg_i2c(d, state->af9013_i2c_addr[1], 0xe205, 0x01);
if (ret)
goto err;
/* Poll firmware ready */
for (val = 0x00, timeout = jiffies + msecs_to_jiffies(1000);
!time_after(jiffies, timeout) && val != 0x0c && val != 0x04;) {
msleep(20);
/* Check firmware status. 0c=OK, 04=fail */
ret = af9015_read_reg_i2c(d, state->af9013_i2c_addr[1],
0x98be, &val);
if (ret)
goto err;
dev_dbg(&intf->dev, "firmware status %02x\n", val);
}
dev_dbg(&intf->dev, "firmware boot took %u ms\n",
jiffies_to_msecs(jiffies) - (jiffies_to_msecs(timeout) - 1000));
if (val == 0x04) {
ret = -ETIMEDOUT;
ret = -ENODEV;
dev_err(&intf->dev, "firmware did not run\n");
goto err;
} else if (val != 0x0c) {
ret = -ETIMEDOUT;
dev_err(&intf->dev, "firmware boot timeout\n");
goto err;
}
error:
exit:
return 0;
err:
dev_dbg(&intf->dev, "failed %d\n", ret);
return ret;
}