Commit 865fdb08 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'input-for-v6.4-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

Pull input updates from Dmitry Torokhov:

 - a new driver for Novatek touch controllers

 - a new driver for power button for NXP BBNSM

 - a skeleton KUnit tests for the input core

 - improvements to Xpad game controller driver to support more devices

 - improvements to edt-ft5x06, hideep and other drivers

* tag 'input-for-v6.4-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (42 commits)
  Revert "Input: xpad - fix support for some third-party controllers"
  dt-bindings: input: pwm-beeper: convert to dt schema
  Input: xpad - fix PowerA EnWired Controller guide button
  Input: xpad - add constants for GIP interface numbers
  Input: synaptics-rmi4 - fix function name in kerneldoc
  Input: raspberrypi-ts - fix refcount leak in rpi_ts_probe
  Input: edt-ft5x06 - select REGMAP_I2C
  Input: melfas_mip4 - report palm touches
  Input: cma3000_d0x - remove unneeded code
  Input: edt-ft5x06 - calculate points data length only once
  Input: edt-ft5x06 - unify the crc check
  Input: edt-ft5x06 - convert to use regmap API
  Input: edt-ft5x06 - don't print error messages with dev_dbg()
  Input: edt-ft5x06 - remove code duplication
  Input: edt-ft5x06 - don't recalculate the CRC
  Input: edt-ft5x06 - add spaces to ensure format specification
  Input: edt-ft5x06 - remove unnecessary blank lines
  Input: edt-ft5x06 - fix indentation
  Input: tsc2007 - enable cansleep pendown GPIO
  Input: Add KUnit tests for some of the input core helper functions
  ...
parents c8c655c3 9a87ffc9

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

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ properties: 
      when the keyboard has a custom design for the top row keys.



dependencies:

  function-row-phsymap: [ 'linux,keymap' ]

  function-row-physmap: [ 'linux,keymap' ]

  google,needs-ghost-filter: [ 'linux,keymap' ]



required:

Documentation/devicetree/bindings/input/pwm-beeper.txt

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
* PWM beeper device tree bindings



Registers a PWM device as beeper.



Required properties:

- compatible: should be "pwm-beeper"

- pwms: phandle to the physical PWM device



Optional properties:

- amp-supply: phandle to a regulator that acts as an amplifier for the beeper

- beeper-hz:  bell frequency in Hz



Example:



beeper_amp: amplifier {

	compatible = "fixed-regulator";

	gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;

};



beeper {

	compatible = "pwm-beeper";

	pwms = <&pwm0>;

	amp-supply = <&beeper_amp>;

};

Documentation/devicetree/bindings/input/pwm-beeper.yaml

0 → 100644
+41 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/input/pwm-beeper.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: PWM beeper



maintainers:

  - Sascha Hauer <s.hauer@pengutronix.de>



properties:

  compatible:

    const: pwm-beeper



  pwms:

    maxItems: 1



  amp-supply:

    description: an amplifier for the beeper



  beeper-hz:

    description: bell frequency in Hz

    minimum: 10

    maximum: 10000



required:

  - compatible

  - pwms



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/gpio/gpio.h>

    beeper {

        compatible = "pwm-beeper";

        pwms = <&pwm0>;

        amp-supply = <&beeper_amp>;

        beeper-hz = <1000>;

    };

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -14877,6 +14877,12 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/wtarreau/nolibc.git 
F:	tools/include/nolibc/

F:	tools/testing/selftests/nolibc/









NOVATEK NVT-TS I2C TOUCHSCREEN DRIVER









M:	Hans de Goede <hdegoede@redhat.com>









L:	linux-input@vger.kernel.org









S:	Maintained









F:	drivers/input/touchscreen/novatek-nvt-ts.c

















NSDEPS









M:	Matthias Maennich <maennich@google.com>









S:	Maintained
































arch/arm/mach-pxa/spitz.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -25,6 +25,7 @@







#include <linux/spi/pxa2xx_spi.h>









#include <linux/mtd/sharpsl.h>









#include <linux/mtd/physmap.h>









#include <linux/input-event-codes.h>









#include <linux/input/matrix_keypad.h>









#include <linux/regulator/machine.h>









#include <linux/io.h>