Input: edt-ft5x06 - show firmware version by sysfs

The firmware version was printed only if debug mode was enabled. Now you
can always get it from sysfs.

Co-developed-by: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Acked-by: Oliver Graute <oliver.graute@kococonnector.com>
Link: https://lore.kernel.org/r/20220621123937.1330389-6-dario.binacchi@amarulasolutions.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
index e04d558456fbc8e8df69650eb634221517bd4f40..03e7e9522a0616696bb6094a8a3af4208ccd5e98 100644 (file)
--- a/drivers/input/touchscreen/edt-ft5x06.c
+++ b/drivers/input/touchscreen/edt-ft5x06.c
@@ -130,6 +130,7 @@ struct edt_ft5x06_ts_data {
        int max_support_points;
 
        char name[EDT_NAME_LEN];
+       char fw_version[EDT_NAME_LEN];
 
        struct edt_reg_addr reg_addr;
        enum edt_ver version;
@@ -541,6 +542,17 @@ static ssize_t model_show(struct device *dev, struct device_attribute *attr,
 
 static DEVICE_ATTR_RO(model);
 
+static ssize_t fw_version_show(struct device *dev,
+                              struct device_attribute *attr, char *buf)
+{
+       struct i2c_client *client = to_i2c_client(dev);
+       struct edt_ft5x06_ts_data *tsdata = i2c_get_clientdata(client);
+
+       return sysfs_emit(buf, "%s\n", tsdata->fw_version);
+}
+
+static DEVICE_ATTR_RO(fw_version);
+
 static struct attribute *edt_ft5x06_attrs[] = {
        &edt_ft5x06_attr_gain.dattr.attr,
        &edt_ft5x06_attr_offset.dattr.attr,
@@ -549,6 +561,7 @@ static struct attribute *edt_ft5x06_attrs[] = {
        &edt_ft5x06_attr_threshold.dattr.attr,
        &edt_ft5x06_attr_report_rate.dattr.attr,
        &dev_attr_model.attr,
+       &dev_attr_fw_version.attr,
        NULL
 };
 
@@ -835,13 +848,13 @@ static void edt_ft5x06_ts_teardown_debugfs(struct edt_ft5x06_ts_data *tsdata)
 #endif /* CONFIG_DEBUGFS */
 
 static int edt_ft5x06_ts_identify(struct i2c_client *client,
-                                       struct edt_ft5x06_ts_data *tsdata,
-                                       char *fw_version)
+                                 struct edt_ft5x06_ts_data *tsdata)
 {
        u8 rdbuf[EDT_NAME_LEN];
        char *p;
        int error;
        char *model_name = tsdata->name;
+       char *fw_version = tsdata->fw_version;
 
        /* see what we find if we assume it is a M06 *
         * if we get less than EDT_NAME_LEN, we don't want
@@ -1098,7 +1111,6 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client,
        unsigned long irq_flags;
        int error;
        u32 report_rate;
-       char fw_version[EDT_NAME_LEN];
 
        dev_dbg(&client->dev, "probing for EDT FT5x06 I2C\n");
 
@@ -1211,7 +1223,7 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client,
        tsdata->input = input;
        tsdata->factory_mode = false;
 
-       error = edt_ft5x06_ts_identify(client, tsdata, fw_version);
+       error = edt_ft5x06_ts_identify(client, tsdata);
        if (error) {
                dev_err(&client->dev, "touchscreen probe failed\n");
                return error;
@@ -1250,7 +1262,7 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client,
 
        dev_dbg(&client->dev,
                "Model \"%s\", Rev. \"%s\", %dx%d sensors\n",
-               tsdata->name, fw_version, tsdata->num_x, tsdata->num_y);
+               tsdata->name, tsdata->fw_version, tsdata->num_x, tsdata->num_y);
 
        input->name = tsdata->name;
        input->id.bustype = BUS_I2C;