Commit 43ba5883 authored by Hans de Goede's avatar Hans de Goede Committed by Dmitry Torokhov

Input: silead_gsl1680 - document firmware-name, fix implementation

The driver has supported touchscreen-fw-name to specify the firmware to
load since it has been merged, but this was omitted from the dt-binding
documentation.

During review of adding touchscreen-fw-name to the binding documentation
it was brought up that there is a standard property name called
"firmware-name" for this, which should be used.

Since there are no users of touchscreen-fw-name yet, this commit
adds documentation of "firmware-name" to the dt-binding documentation
and switches the driver over to use this.

This commit also makes the driver add a "silead/" prefix to the
firmware name from dt before calling request_firmware. That the
firmware files are stored under /lib/firmware/silead under Linux
is an implementation detail and does not belong in devicetree.
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent e3a888a4
...@@ -13,6 +13,7 @@ Required properties: ...@@ -13,6 +13,7 @@ Required properties:
- touchscreen-size-y : See touchscreen.txt - touchscreen-size-y : See touchscreen.txt
Optional properties: Optional properties:
- firmware-name : File basename (string) for board specific firmware
- touchscreen-inverted-x : See touchscreen.txt - touchscreen-inverted-x : See touchscreen.txt
- touchscreen-inverted-y : See touchscreen.txt - touchscreen-inverted-y : See touchscreen.txt
- touchscreen-swapped-x-y : See touchscreen.txt - touchscreen-swapped-x-y : See touchscreen.txt
......
...@@ -390,9 +390,10 @@ static void silead_ts_read_props(struct i2c_client *client) ...@@ -390,9 +390,10 @@ static void silead_ts_read_props(struct i2c_client *client)
data->max_fingers = 5; /* Most devices handle up-to 5 fingers */ data->max_fingers = 5; /* Most devices handle up-to 5 fingers */
} }
error = device_property_read_string(dev, "touchscreen-fw-name", &str); error = device_property_read_string(dev, "firmware-name", &str);
if (!error) if (!error)
snprintf(data->fw_name, sizeof(data->fw_name), "%s", str); snprintf(data->fw_name, sizeof(data->fw_name),
"silead/%s", str);
else else
dev_dbg(dev, "Firmware file name read error. Using default."); dev_dbg(dev, "Firmware file name read error. Using default.");
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment