Commits · 92e24e0e57f72e06c2df87116557331fd2d4dda2 · Mirrors / github.com / raspberrypi_linux

Jul 26, 2023

Input: psmouse - add delay when deactivating for SMBus mode · 92e24e0e

Jeffery Miller authored Jul 26, 2023

There is a period of time between the psmouse deactivate and the
ability to communicate with the SMBus companion. Insert a
sleep after the deactivate to account for the delay and ensure
the SMBus companion is responsive.

Attempting to read from the SMBus companion too quickly was causing
the touchpad on machines with an i801_smbus companion to stop working
after a sleep/resume cycle.

On resume the rmi4_smbus would fail with errors reading the SMBus version
number:
```
[5454] i2c_i801:i801_check_post:414: i801_smbus 0000:00:1f.3: No response
smbus_result: i2c-0 a=02c f=0000 c=fd BYTE_DATA rd res=-6
rmi4_smbus 0-002c: failed to get SMBus version number!
...
rmi4_f01 rmi4-00.fn01: Failed to restore normal operation: -6.
rmi4_f01 rmi4-00.fn01: Resume failed with code -6.
rmi4_physical rmi4-00: Failed to suspend functions: -6
rmi4_smbus 0-002c: Failed to resume device: -6
```
In this case the rmi_smb_get_version fails with -ENXIO if it happens too
soon after the preceding serio_resume -> psmouse_deactivate call.

On boot this issue could cause the touchpad to stay in the limited PS/2
mode. This only reproduced in 1 in 10 boots on the Lenovo T440p.
Failures in the log on boot would show up as:
```
psmouse serio1: synaptics: Trying to set up SMBus access
[122] i2c_i801:i801_check_post:437: i801_smbus 0000:00:1f.3: No response
psmouse serio1: synaptics: SMbus companion is not ready yet
```

Experimentation on the Lenovo T440p showed that a delay of 7-12ms on
resume allowed the companion to respond.

The 30ms delay in this patch was chosen based on the linux-input message:
Link: https://lore.kernel.org/all/BYAPR03MB47572F2C65E52ED673238D41B2439@BYAPR03MB4757.namprd03.prod.outlook.com/

Signed-off-by: Jeffery Miller <jefferymiller@google.com>
Link: https://lore.kernel.org/r/20230726025256.81174-1-jefferymiller@google.com

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

92e24e0e

Input: mcs-touchkey - fix uninitialized use of error in mcs_touchkey_probe() · 8362bf82

Nathan Chancellor authored Jul 25, 2023

Clang warns (or errors with CONFIG_WERROR=y):

  drivers/input/keyboard/mcs_touchkey.c:149:49: error: variable 'error' is uninitialized when used here [-Werror,-Wuninitialized]
    149 |                 dev_err(&client->dev, "i2c read error[%d]\n", error);
        |                                                               ^~~~~
  include/linux/dev_printk.h:144:65: note: expanded from macro 'dev_err'
    144 |         dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__)
        |                                                                        ^~~~~~~~~~~
  include/linux/dev_printk.h:110:23: note: expanded from macro 'dev_printk_index_wrap'
    110 |                 _p_func(dev, fmt, ##__VA_ARGS__);                       \
        |                                     ^~~~~~~~~~~
  drivers/input/keyboard/mcs_touchkey.c:110:11: note: initialize the variable 'error' to silence this warning
    110 |         int error;
        |                  ^
        |                   = 0
  1 error generated.

A refactoring updated the error handling in this block but did not
update the dev_err() call to use fw_ver instead of error. Do so now to
fix the warning and avoid printing uninitialized memory.

Closes: https://github.com/ClangBuiltLinux/linux/issues/1893


Fixes: e175eae1 ("Input: mcs-touchkey - convert to use devm_* api")
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Link: https://lore.kernel.org/r/20230725-mcs_touchkey-fix-wuninitialized-v1-1-615db39af51c@kernel.org


Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

8362bf82

Jul 21, 2023

Input: qt1070 - convert to use devm_* api · 447c0954

Yangtao Li authored Jul 20, 2023



Use devm_* api to simplify code, this makes it unnecessary to explicitly
release resources.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
Link: https://lore.kernel.org/r/20230714080611.81302-5-frank.li@vivo.com


Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

447c0954

Input: mcs-touchkey - convert to use devm_* api · e175eae1

Yangtao Li authored Jul 20, 2023



Use devm_* api to simplify code, this makes it unnecessary to explicitly
release resources.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
Link: https://lore.kernel.org/r/20230714080611.81302-3-frank.li@vivo.com


Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

e175eae1

Input: amikbd - convert to use devm_* api · caddca33

Yangtao Li authored Jul 20, 2023



Use devm_* api to simplify code, this makes it unnecessary to explicitly
release resources.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
Link: https://lore.kernel.org/r/20230714080611.81302-2-frank.li@vivo.com


Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

caddca33

Input: lm8333 - convert to use devm_* api · 2b6aa9e7

Yangtao Li authored Jul 20, 2023



Use devm_* api to simplify code, this makes it unnecessary to explicitly
release resources.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
Link: https://lore.kernel.org/r/20230714080611.81302-1-frank.li@vivo.com


Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

2b6aa9e7

Jul 19, 2023

Input: mms114 - add support for touch keys · bf93349b

Artur Weber authored Jul 18, 2023

MELFAS MMS114 and similar touchscreens have support for touch keys.
Enable support of them in the driver. The keycodes to emit can be
controlled by the linux,keycodes DT property.

Sidenote - the MAX_TOUCHKEYS value is set to 15, as that's the
maximum value that the ID field can contain. I don't have access
to any datasheets that could confirm or deny whether this is accurate.

Most downstream drivers I've been able to find only use up to 2 keys
(though I did find a driver that mentioned up to 4, but only 2 were
used). They don't have any checks for a maximum keycode value, it is
just extracted from the ID bits (0xf mask).

The drivers I've been able to find also don't use touch ID 0; I assume
that it is never used, so the keycodes provided in the DT start from
touch ID 1. I suppose this is in-line with the regular behavior
for touch IDs in touchscreen events, as there the provided touch ID
is always lowered by 1, which would cause an overflow if it was 0...
Just in case, we quietly return if the touch ID is set to 0 here.

The implementation of the linux,keycodes property handling code was
adapted from the msg2638 driver.

Signed-off-by: Artur Weber <aweber.kernel@gmail.com>
Link: https://lore.kernel.org/r/20230714100424.29798-3-aweber.kernel@gmail.com

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

bf93349b

dt-bindings: mms114: Add linux,keycodes property for touch keys · 21c133be

Artur Weber authored Jul 18, 2023



MELFAS MMS114 and similar touchscreens have support for touch keys.
Add the linux,keycodes property which can be used to set up the
keycodes for the touch keys.

Acked-by: Conor Dooley <conor.dooley@microchip.com>
Signed-off-by: Artur Weber <aweber.kernel@gmail.com>
Link: https://lore.kernel.org/r/20230714100424.29798-2-aweber.kernel@gmail.com


Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

21c133be

Input: da9063 - add wakeup support · d7781232

Samuel Holland authored Jul 17, 2023

Mark the IRQ as a wake IRQ so it will be enabled during system suspend.

Signed-off-by: Samuel Holland <samuel.holland@sifive.com>
Link: https://lore.kernel.org/r/20230717192004.1304287-1-samuel.holland@sifive.com

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

d7781232

Jul 18, 2023

Input: gpio-keys - convert to dev_err_probe() · 904ef2c4

Geert Uytterhoeven authored Jul 17, 2023

Use the dev_err_probe() helper, instead of open-coding the same
operation.

While at it, invert the error checking logic to simplify code flow.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/d225a837c50e2b19a41555a8f7ce0f94b1689aa4.1689600353.git.geert+renesas@glider.be

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

904ef2c4

Input: Explicitly include correct DT includes · dbce1a7d

Rob Herring authored Jul 17, 2023

The DT of_device.h and of_platform.h date back to the separate
of_platform_bus_type before it as merged into the regular platform bus.
As part of that merge prepping Arm DT support 13 years ago, they
"temporarily" include each other. They also include platform_device.h
and of.h. As a result, there's a pretty much random mix of those include
files used throughout the tree. In order to detangle these headers and
replace the implicit includes with struct declarations, users need to
explicitly include the correct includes.

Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20230714174633.4058096-1-robh@kernel.org

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

dbce1a7d

Merge tag 'v6.4' into next · 50501936
Dmitry Torokhov authored Jul 17, 2023
```
Sync up with mainline to bring in updates to shared infrastructure.
```
50501936

Jul 14, 2023

Input: iqs7211 - point to match data directly · 677232f8

Jeff LaBundy authored Jul 13, 2023



Point the OF match table directly to the struct that describes the
device as opposed to an intermediate enum; doing so simplifies the
code and avoids a clang warning.

As part of this change, the I2C device ID table is removed, as the
device cannot probe without an OF node due to the unique nature of
the hardware's interrupt pin.

Fixes: f2ba47e6 ("Input: add support for Azoteq IQS7210A/7211A/E")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202307131717.LtwApG0z-lkp@intel.com/


Signed-off-by: Jeff LaBundy <jeff@labundy.com>
Link: https://lore.kernel.org/r/ZLA+cuciIeVcCvm6@nixie71


Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

677232f8

Jul 13, 2023

Input: add support for Azoteq IQS7210A/7211A/E · f2ba47e6

Jeff LaBundy authored May 29, 2023



Add support for the Azoteq IQS7210A/7211A/E family of trackpad/
touchscreen controllers.

Signed-off-by: Jeff LaBundy <jeff@labundy.com>
Link: https://lore.kernel.org/r/ZHVEeDlYyr69A59K@nixie71


Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

f2ba47e6

dt-bindings: input: Add bindings for Azoteq IQS7210A/7211A/E · d6239463

Jeff LaBundy authored May 29, 2023



Add bindings for the Azoteq IQS7210A/7211A/E family of trackpad/
touchscreen controllers.

Signed-off-by: Jeff LaBundy <jeff@labundy.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/ZHVEa0yM1LLUJEfO@nixie71


Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

d6239463

Input: rotary_encoder - don't double assign input->dev.parent · 0859c176

Roi L authored Jul 12, 2023



devm_input_allocate_device() already assigns the @dev.parent field of the
input device/structure, so there's no need to reassign input->dev.parent
to dev.

Signed-off-by: Roi L <roeilev321_@outlook.com>
Link: https://lore.kernel.org/r/PH0P220MB0460B69CA018F5515F5FACDDDD53A@PH0P220MB0460.NAMP220.PROD.OUTLOOK.COM


Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

0859c176

Input: bcm-keypad - correct dev_err_probe() error · 0b64150c

Krzysztof Kozlowski authored Jul 12, 2023

Pass proper PTR_ERR as dev_err_probe() argument.

Fixes: a2c795b6 ("Input: bcm-keypad - simplify with dev_err_probe()")
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/r/202306261505.wTjCXRIO-lkp@intel.com/

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20230711072449.43569-1-krzysztof.kozlowski@linaro.org

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

0b64150c

Jul 11, 2023

Input: lpc32xx_ts - convert to use devm_* api · f1efdf7f