]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Input: st1232 - add IDLE state as ready condition
authorMichael Tretter <m.tretter@pengutronix.de>
Fri, 19 Feb 2021 18:37:00 +0000 (10:37 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 19 Feb 2021 19:03:44 +0000 (11:03 -0800)
The st1232 can switch from NORMAL to IDLE state after the configured
idle time (by default 8 s). If the st1232 is not reset during probe, it
might already be ready but in IDLE state. Since it does not enter NORMAL
state in this case, probe fails.

Fix the wait function to report the IDLE state as ready, too.

Fixes: f605be6a57b4 ("Input: st1232 - wait until device is ready before reading resolution")
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
Link: https://lore.kernel.org/r/20210219110556.1858969-1-m.tretter@pengutronix.de
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/touchscreen/st1232.c

index b4e7bcbe9b91d9c5e527ccb4d773e20ae4b8d847..885f0572488dd0617b009cdea086f7e6f9355ed5 100644 (file)
@@ -94,7 +94,7 @@ static int st1232_ts_wait_ready(struct st1232_ts_data *ts)
 
        for (retries = 10; retries; retries--) {
                error = st1232_ts_read_data(ts, REG_STATUS, 1);
-               if (!error && ts->read_buf[0] == (STATUS_NORMAL | ERROR_NONE))
+               if (!error && ts->read_buf[0] == (STATUS_NORMAL | STATUS_IDLE | ERROR_NONE))
                        return 0;
 
                usleep_range(1000, 2000);