]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
Merge tag 'input-for-v6.13-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Nov 2024 18:31:39 +0000 (10:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Nov 2024 18:31:39 +0000 (10:31 -0800)
Pull input updates from Dmitry Torokhov:

 - support for NT36672A touchscreen added to novatek-nvt-ts driver

 - a change to ads7846 driver to prevent XPT2046 from locking up

 - a change switching platform input dirves back to using remove()
   method (from remove_new())

 - updates to a number of input drivers to use the new cleanup
   facilities (__free(...), guard(), and scoped-guard()) which ensure
   that the resources and locks are released properly and automatically

 - other assorted driver cleanups and fixes.

* tag 'input-for-v6.13-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (109 commits)
  Input: mpr121 - use devm_regulator_get_enable_read_voltage()
  Input: sun4i-lradc-keys - don't include 'pm_wakeup.h' directly
  Input: spear-keyboard - don't include 'pm_wakeup.h' directly
  Input: cypress-sf - constify struct i2c_device_id
  Input: ads7846 - increase xfer array size in 'struct ser_req'
  Input: fix the input_event struct documentation
  Input: i8042 - fix typo dublicate to duplicate
  Input: ads7846 - add dummy command register clearing cycle
  Input: cs40l50 - fix wrong usage of INIT_WORK()
  Input: introduce notion of passive observers for input handlers
  Input: maple_keyb - use guard notation when acquiring mutex
  Input: locomokbd - use guard notation when acquiring spinlock
  Input: hilkbd - use guard notation when acquiring spinlock
  Input: synaptics-rmi4 - switch to using cleanup functions in F34
  Input: synaptics - fix a typo
  dt-bindings: input: rotary-encoder: Fix "rotary-encoder,rollover" type
  Input: omap-keypad - use guard notation when acquiring mutex
  Input: imagis - fix warning regarding 'imagis_3038_data' being unused
  Input: userio - remove unneeded semicolon
  Input: sparcspkr - use cleanup facility for device_node
  ...

20 files changed:
1  2 
Documentation/devicetree/bindings/input/mediatek,pmic-keys.yaml
MAINTAINERS
drivers/input/input.c
drivers/input/joystick/iforce/iforce-packets.c
drivers/input/keyboard/applespi.c
drivers/input/keyboard/cros_ec_keyb.c
drivers/input/keyboard/ep93xx_keypad.c
drivers/input/misc/ims-pcu.c
drivers/input/misc/iqs7222.c
drivers/input/misc/wistron_btns.c
drivers/input/mouse/elan_i2c_core.c
drivers/input/mouse/elan_i2c_i2c.c
drivers/input/rmi4/rmi_f34.c
drivers/input/serio/userio.c
drivers/input/touchscreen/ads7846.c
drivers/input/touchscreen/edt-ft5x06.c
drivers/input/touchscreen/ili210x.c
drivers/input/touchscreen/novatek-nvt-ts.c
drivers/input/touchscreen/pixcir_i2c_ts.c
drivers/platform/x86/x86-android-tablets/other.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
index dcbc50304a5a465e707ea4baeaa5f8decde0a9ae,144c73540d45ce750d88d4b8b05e6a1fabf1eca8..817c23438f6e5176431e1f736bb511f9919b67de
@@@ -286,10 -313,9 +282,10 @@@ static struct platform_driver ep93xx_ke
        .driver         = {
                .name   = "ep93xx-keypad",
                .pm     = pm_sleep_ptr(&ep93xx_keypad_pm_ops),
 +              .of_match_table = ep93xx_keypad_of_ids,
        },
        .probe          = ep93xx_keypad_probe,
-       .remove_new     = ep93xx_keypad_remove,
+       .remove         = ep93xx_keypad_remove,
  };
  module_platform_driver(ep93xx_keypad_driver);
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge