p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Input: raydium_i2c_ts - include hardware version in firmware name 

Add hardware version to the firmware file name to handle scenarios where
single system image supports variety of devices.

Signed-off-by: Jeffrey Lin <jeffrey.lin@rad-ic.com>
Patchwork-Id: 10127677
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Jeffrey Lin 2018-01-04 21:35:23 -08:00 committed by Dmitry Torokhov
parent b8af0b5b92
commit 92a37438ce
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/input/touchscreen/raydium_i2c_ts.c
View File

@ -752,13 +752,20 @@ static int raydium_i2c_fw_update(struct raydium_data *ts)
{ {
struct i2c_client *client = ts->client; struct i2c_client *client = ts->client;
const struct firmware *fw = NULL; const struct firmware *fw = NULL;
const char *fw_file = "raydium.fw"; char *fw_file;
int error; int error;
fw_file = kasprintf(GFP_KERNEL, "raydium_%#04x.fw",
le32_to_cpu(ts->info.hw_ver));
if (!fw_file)
return -ENOMEM;
dev_dbg(&client->dev, "firmware name: %s\n", fw_file);
error = request_firmware(&fw, fw_file, &client->dev); error = request_firmware(&fw, fw_file, &client->dev);
if (error) { if (error) {
dev_err(&client->dev, "Unable to open firmware %s\n", fw_file); dev_err(&client->dev, "Unable to open firmware %s\n", fw_file);
return error; goto out_free_fw_file;
} }
disable_irq(client->irq); disable_irq(client->irq);
@ -787,6 +794,9 @@ static int raydium_i2c_fw_update(struct raydium_data *ts)
release_firmware(fw); release_firmware(fw);
out_free_fw_file:
kfree(fw_file);
return error; return error;
} }