]> Git Repo - J-linux.git/commitdiff
Merge tag 'input-for-v5.19-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <[email protected]>
Sat, 28 May 2022 21:05:54 +0000 (14:05 -0700)
committerLinus Torvalds <[email protected]>
Sat, 28 May 2022 21:05:54 +0000 (14:05 -0700)
Pull input updates from Dmitry Torokhov:

 - a new driver for the Azoteq IQS7222A/B/C capacitive touch controller

 - a new driver for Raspberry Pi Sense HAT joystick

 - sun4i-lradc-keys gained support of R329 and D1 variants, plus it can
   be now used as a wakeup source

 - pm8941-pwrkey can now properly handle PON GEN3 variants; the driver
   also implements software debouncing and has a workaround for missing
   key press events

 - assorted driver fixes and cleanups

* tag 'input-for-v5.19-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (29 commits)
  Input: stmfts - do not leave device disabled in stmfts_input_open
  Input: gpio-keys - cancel delayed work only in case of GPIO
  Input: cypress_ps2 - fix typo in comment
  Input: vmmouse - disable vmmouse before entering suspend mode
  dt-bindings: google,cros-ec-keyb: Fixup bad compatible match
  Input: cros-ec-keyb - allow skipping keyboard registration
  dt-bindings: google,cros-ec-keyb: Introduce switches only compatible
  Input: psmouse-smbus - avoid flush_scheduled_work() usage
  Input: bcm-keypad - remove unneeded NULL check before clk_disable_unprepare
  Input: sparcspkr - fix refcount leak in bbc_beep_probe
  Input: sun4i-lradc-keys - add support for R329 and D1
  Input: sun4i-lradc-keys - add optional clock/reset support
  dt-bindings: input: sun4i-lradc-keys: Add R329 and D1 compatibles
  Input: sun4i-lradc-keys - add wakeup support
  Input: pm8941-pwrkey - simulate missed key press events
  Input: pm8941-pwrkey - add software key press debouncing support
  Input: pm8941-pwrkey - add support for PON GEN3 base addresses
  Input: pm8941-pwrkey - fix error message
  Input: synaptics-rmi4 - remove unnecessary flush_workqueue()
  Input: ep93xx_keypad - use devm_platform_ioremap_resource() helper
  ...

1  2 
Documentation/devicetree/bindings/input/google,cros-ec-keyb.yaml

index aa61fe64be63ccb99976584d1851b19b2a6cd777,c31a02149f37f143267f7b79ff0d0b5af71d0cd3..e05690b3e963cf407cfe4a24fd7b66618c71aae2
@@@ -15,14 -15,16 +15,16 @@@ description: 
    Google's ChromeOS EC Keyboard is a simple matrix keyboard
    implemented on a separate EC (Embedded Controller) device. It provides
    a message for reading key scans from the EC. These are then converted
-   into keycodes for processing by the kernel.
- allOf:
-   - $ref: "/schemas/input/matrix-keymap.yaml#"
+   into keycodes for processing by the kernel. This device also supports
+   switches/buttons like power and volume buttons.
  
  properties:
    compatible:
-     const: google,cros-ec-keyb
+     oneOf:
+       - description: ChromeOS EC with only buttons/switches
+         const: google,cros-ec-keyb-switches
+       - description: ChromeOS EC with keyboard and possibly buttons/switches
+         const: google,cros-ec-keyb
  
    google,needs-ghost-filter:
      description:
@@@ -31,7 -33,6 +33,7 @@@
      type: boolean
  
    function-row-physmap:
 +    $ref: /schemas/types.yaml#/definitions/uint32-array
      minItems: 1
      maxItems: 15
      description: |
        where the lower 16 bits are reserved. This property is specified only
        when the keyboard has a custom design for the top row keys.
  
+ dependencies:
+   function-row-phsymap: [ 'linux,keymap' ]
+   google,needs-ghost-filter: [ 'linux,keymap' ]
  required:
    - compatible
  
+ if:
+   properties:
+     compatible:
+       contains:
+         const: google,cros-ec-keyb
+ then:
+   $ref: "/schemas/input/matrix-keymap.yaml#"
+   required:
+     - keypad,num-rows
+     - keypad,num-columns
+     - linux,keymap
  unevaluatedProperties: false
  
  examples:
    - |
      #include <dt-bindings/input/input.h>
-     cros-ec-keyb {
+     keyboard-controller {
          compatible = "google,cros-ec-keyb";
          keypad,num-rows = <8>;
          keypad,num-columns = <13>;
              /* UP      LEFT    */
              0x070b0067 0x070c0069>;
      };
+   - |
+     /* No matrix keyboard, just buttons/switches */
+     keyboard-controller {
+         compatible = "google,cros-ec-keyb-switches";
+     };
+ ...
This page took 0.071859 seconds and 4 git commands to generate.