2 files changed, 4 insertions, 2 deletions

diff --git a/Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt b/Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt
index 1112e0d794e1..820fee4b77b6 100644
--- a/Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt
+++ b/Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt
@@ -13,6 +13,7 @@ Required properties:
 - touchscreen-size-y      : See touchscreen.txt
 
 Optional properties:
+- firmware-name           : File basename (string) for board specific firmware
 - touchscreen-inverted-x  : See touchscreen.txt
 - touchscreen-inverted-y  : See touchscreen.txt
 - touchscreen-swapped-x-y : See touchscreen.txt
diff --git a/drivers/input/touchscreen/silead.c b/drivers/input/touchscreen/silead.c
index b2744a64e933..c7ab116a16b3 100644
--- a/drivers/input/touchscreen/silead.c
+++ b/drivers/input/touchscreen/silead.c
@@ -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 */
         }
 
-        error = device_property_read_string(dev, "touchscreen-fw-name", &str);
+        error = device_property_read_string(dev, "firmware-name", &str);
         if (!error)
-                snprintf(data->fw_name, sizeof(data->fw_name), "%s", str);
+                snprintf(data->fw_name, sizeof(data->fw_name),
+                         "silead/%s", str);
         else
                 dev_dbg(dev, "Firmware file name read error. Using default.");
 }