Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
"Just a fix up for the firmware handling to the Silead driver (which is
a new driver in this release)"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: silead_gsl1680 - use "silead/" prefix for firmware loading
Input: silead_gsl1680 - document firmware-name, fix implementation
+10
-7
+1
Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt
+1
Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt
···
13
13
- touchscreen-size-y : See touchscreen.txt
14
14
15
15
Optional properties:
16
+
- firmware-name : File basename (string) for board specific firmware
16
17
- touchscreen-inverted-x : See touchscreen.txt
17
18
- touchscreen-inverted-y : See touchscreen.txt
18
19
- touchscreen-swapped-x-y : See touchscreen.txt
+9
-7
drivers/input/touchscreen/silead.c
+9
-7
drivers/input/touchscreen/silead.c
···
390
390
data->max_fingers = 5; /* Most devices handle up-to 5 fingers */
391
391
}
392
392
393
-
error = device_property_read_string(dev, "touchscreen-fw-name", &str);
393
+
error = device_property_read_string(dev, "firmware-name", &str);
394
394
if (!error)
395
-
snprintf(data->fw_name, sizeof(data->fw_name), "%s", str);
395
+
snprintf(data->fw_name, sizeof(data->fw_name),
396
+
"silead/%s", str);
396
397
else
397
398
dev_dbg(dev, "Firmware file name read error. Using default.");
398
399
}
···
411
410
if (!acpi_id)
412
411
return -ENODEV;
413
412
414
-
snprintf(data->fw_name, sizeof(data->fw_name), "%s.fw",
415
-
acpi_id->id);
413
+
snprintf(data->fw_name, sizeof(data->fw_name),
414
+
"silead/%s.fw", acpi_id->id);
416
415
417
416
for (i = 0; i < strlen(data->fw_name); i++)
418
417
data->fw_name[i] = tolower(data->fw_name[i]);
419
418
} else {
420
-
snprintf(data->fw_name, sizeof(data->fw_name), "%s.fw",
421
-
id->name);
419
+
snprintf(data->fw_name, sizeof(data->fw_name),
420
+
"silead/%s.fw", id->name);
422
421
}
423
422
424
423
return 0;
···
427
426
static int silead_ts_set_default_fw_name(struct silead_ts_data *data,
428
427
const struct i2c_device_id *id)
429
428
{
430
-
snprintf(data->fw_name, sizeof(data->fw_name), "%s.fw", id->name);
429
+
snprintf(data->fw_name, sizeof(data->fw_name),
430
+
"silead/%s.fw", id->name);
431
431
return 0;
432
432
}
433
433
#endif