Input: goodix - refactor reset handling

[ Upstream commit 209bda4741f68f102cf2f272227bfc938e387b51 ]

Refactor reset handling a bit, change the main reset handler
into a new goodix_reset_no_int_sync() helper and add a
goodix_reset() wrapper which calls goodix_int_sync()
separately.

Also push the dev_err() call on reset failure into the
goodix_reset_no_int_sync() and goodix_int_sync() functions,
so that we don't need to have separate dev_err() calls in
all their callers.

This is a preparation patch for adding support for controllers
without flash, which need to have their firmware uploaded and
need some other special handling too.

Reviewed-by: Bastien Nocera <hadess@hadess.net>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20210920150643.155872-4-hdegoede@redhat.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c
index 5ccdd6a..2ca903a 100644 (file)
--- a/drivers/input/touchscreen/goodix.c
+++ b/drivers/input/touchscreen/goodix.c
@@ -596,56 +596,76 @@ int goodix_int_sync(struct goodix_ts_data *ts)
 
        error = goodix_irq_direction_output(ts, 0);
        if (error)
-               return error;
+               goto error;
 
        msleep(50);                             /* T5: 50ms */
 
        error = goodix_irq_direction_input(ts);
        if (error)
-               return error;
+               goto error;
 
        return 0;
+
+error:
+       dev_err(&ts->client->dev, "Controller irq sync failed.\n");
+       return error;
 }
 
 /**
- * goodix_reset - Reset device during power on
+ * goodix_reset_no_int_sync - Reset device, leaving interrupt line in output mode
  *
  * @ts: goodix_ts_data pointer
  */
-static int goodix_reset(struct goodix_ts_data *ts)
+int goodix_reset_no_int_sync(struct goodix_ts_data *ts)
 {
        int error;
 
        /* begin select I2C slave addr */
        error = gpiod_direction_output(ts->gpiod_rst, 0);
        if (error)
-               return error;
+               goto error;
 
        msleep(20);                             /* T2: > 10ms */
 
        /* HIGH: 0x28/0x29, LOW: 0xBA/0xBB */
        error = goodix_irq_direction_output(ts, ts->client->addr == 0x14);
        if (error)
-               return error;
+               goto error;
 
        usleep_range(100, 2000);                /* T3: > 100us */
 
        error = gpiod_direction_output(ts->gpiod_rst, 1);
        if (error)
-               return error;
+               goto error;
 
        usleep_range(6000, 10000);              /* T4: > 5ms */
 
        /* end select I2C slave addr */
        error = gpiod_direction_input(ts->gpiod_rst);
        if (error)
-               return error;
+               goto error;
 
-       error = goodix_int_sync(ts);
+       return 0;
+
+error:
+       dev_err(&ts->client->dev, "Controller reset failed.\n");
+       return error;
+}
+
+/**
+ * goodix_reset - Reset device during power on
+ *
+ * @ts: goodix_ts_data pointer
+ */
+static int goodix_reset(struct goodix_ts_data *ts)
+{
+       int error;
+
+       error = goodix_reset_no_int_sync(ts);
        if (error)
                return error;
 
-       return 0;
+       return goodix_int_sync(ts);
 }
 
 #ifdef ACPI_GPIO_SUPPORT
@@ -1144,10 +1164,8 @@ reset:
        if (ts->reset_controller_at_probe) {
                /* reset the controller */
                error = goodix_reset(ts);
-               if (error) {
-                       dev_err(&client->dev, "Controller reset failed.\n");
+               if (error)
                        return error;
-               }
        }
 
        error = goodix_i2c_test(client);
@@ -1289,10 +1307,8 @@ static int __maybe_unused goodix_resume(struct device *dev)
 
        if (error != 0 || config_ver != ts->config[0]) {
                error = goodix_reset(ts);
-               if (error) {
-                       dev_err(dev, "Controller reset failed.\n");
+               if (error)
                        return error;
-               }
 
                error = goodix_send_cfg(ts, ts->config, ts->chip->config_len);
                if (error)

diff --git a/drivers/input/touchscreen/goodix.h b/drivers/input/touchscreen/goodix.h
index cdaced4..0b88554 100644 (file)
--- a/drivers/input/touchscreen/goodix.h
+++ b/drivers/input/touchscreen/goodix.h
@@ -69,5 +69,6 @@ int goodix_i2c_write(struct i2c_client *client, u16 reg, const u8 *buf, int len)
 int goodix_i2c_write_u8(struct i2c_client *client, u16 reg, u8 value);
 int goodix_send_cfg(struct goodix_ts_data *ts, const u8 *cfg, int len);
 int goodix_int_sync(struct goodix_ts_data *ts);
+int goodix_reset_no_int_sync(struct goodix_ts_data *ts);
 
 #endif