Commit 8d9420ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-2022080201' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid 

Pull HID updates from Jiri Kosina:

 - support for AMD SOCs using SFH1.1 memory access (Basavaraj Natikar)

 - XP-PEN Deco L support (José Expósito)

 - support for Elan eKTH6915 touchscreens (Douglas Anderson)

 - other small assorted fixes and device ID additions

* tag 'for-linus-2022080201' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid: (39 commits)
  HID: amd_sfh: Handle condition of "no sensors"
  HID: amd_sfh: Fix implicit declaration error on i386
  HID: apple: Add "GANSS" to the non-Apple list
  HID: alps: Declare U1_UNICORN_LEGACY support
  HID: wacom: Force pen out of prox if no events have been received in a while
  HID: nintendo: Add missing array termination
  HID: lg-g15: Fix comment typo
  HID: amd_sfh: Implement SFH1.1 functionality
  HID: amd_sfh: Move interrupt handling to common interface
  HID: amd_sfh: Move amd_sfh_work to common interface
  HID: amd_sfh: Move global functions to static
  HID: amd_sfh: Add remove operation in amd_mp2_ops
  HID: amd_sfh: Add PM operations in amd_mp2_ops
  HID: amd_sfh: Add descriptor operations in amd_mp2_ops
  HID: amd_sfh: Move request_list variable to client data
  HID: amd_sfh: Move request_list struct to header file
  HID: amd_sfh: Move common macros and structures
  HID: amd_sfh: Add NULL check for hid device
  HID: core: remove unneeded assignment in hid_process_report()
  ID: intel-ish-hid: hid-client: drop unexpected word "the" in the comments
  ...
parents c040862b a60885b6

Documentation/devicetree/bindings/input/elan,ekth6915.yaml

0 → 100644
+65 −0
Original line number Original line 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/elan,ekth6915.yaml#

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



title: Elan eKTH6915 touchscreen controller



maintainers:

  - Douglas Anderson <dianders@chromium.org>



description:

  Supports the Elan eKTH6915 touchscreen controller.

  This touchscreen controller uses the i2c-hid protocol with a reset GPIO.



properties:

  compatible:

    items:

      - const: elan,ekth6915



  reg:

    const: 0x10



  interrupts:

    maxItems: 1



  reset-gpios:

    description: Reset GPIO; not all touchscreens using eKTH6915 hook this up.



  vcc33-supply:

    description: The 3.3V supply to the touchscreen.



  vccio-supply:

    description:

      The IO supply to the touchscreen. Need not be specified if this is the

      same as the 3.3V supply.



required:

  - compatible

  - reg

  - interrupts

  - vcc33-supply



additionalProperties: false



examples:

  - |

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

    #include <dt-bindings/interrupt-controller/irq.h>



    i2c {

      #address-cells = <1>;

      #size-cells = <0>;



      ap_ts: touchscreen@10 {

        compatible = "elan,ekth6915";

        reg = <0x10>;



        interrupt-parent = <&tlmm>;

        interrupts = <9 IRQ_TYPE_LEVEL_LOW>;



        reset-gpios = <&tlmm 8 GPIO_ACTIVE_LOW>;

        vcc33-supply = <&pp3300_ts>;

      };

    };

drivers/hid/.kunitconfig

0 → 100644
+5 −0
Original line number Original line Diff line number Diff line 
CONFIG_KUNIT=y

CONFIG_USB=y

CONFIG_USB_HID=y

CONFIG_HID_UCLOGIC=y

CONFIG_HID_KUNIT_TEST=y

drivers/hid/Kconfig

+16 −0
Original line number Original line Diff line number Diff line
@@ -1306,6 +1306,22 @@ config HID_MCP2221 
	To compile this driver as a module, choose M here: the module

	To compile this driver as a module, choose M here: the module

	will be called hid-mcp2221.ko.

	will be called hid-mcp2221.ko.





config HID_KUNIT_TEST

	bool "KUnit tests for HID" if !KUNIT_ALL_TESTS

	depends on KUNIT=y

	depends on HID_UCLOGIC

	default KUNIT_ALL_TESTS

	help

	  This builds unit tests for HID. This option is not useful for

	  distributions or general kernels, but only for kernel

	  developers working on HID and associated drivers.



	  For more information on KUnit and unit tests in general,

	  please refer to the KUnit documentation in

	  Documentation/dev-tools/kunit/.



	  If in doubt, say "N".



endmenu

endmenu





endif # HID

endif # HID

drivers/hid/Makefile

+3 −0
Original line number Original line Diff line number Diff line
@@ -144,6 +144,9 @@ obj-$(CONFIG_HID_WIIMOTE) += hid-wiimote.o 
obj-$(CONFIG_HID_SENSOR_HUB)	+= hid-sensor-hub.o

obj-$(CONFIG_HID_SENSOR_HUB)	+= hid-sensor-hub.o

obj-$(CONFIG_HID_SENSOR_CUSTOM_SENSOR)	+= hid-sensor-custom.o

obj-$(CONFIG_HID_SENSOR_CUSTOM_SENSOR)	+= hid-sensor-custom.o





obj-$(CONFIG_HID_KUNIT_TEST)	+= hid-uclogic-rdesc.o \

				   hid-uclogic-rdesc-test.o



obj-$(CONFIG_USB_HID)		+= usbhid/

obj-$(CONFIG_USB_HID)		+= usbhid/

obj-$(CONFIG_USB_MOUSE)		+= usbhid/

obj-$(CONFIG_USB_MOUSE)		+= usbhid/

obj-$(CONFIG_USB_KBD)		+= usbhid/

obj-$(CONFIG_USB_KBD)		+= usbhid/

drivers/hid/amd-sfh-hid/Makefile

+3 −0
Original line number Original line Diff line number Diff line
@@ -9,5 +9,8 @@ amd_sfh-objs := amd_sfh_hid.o 
amd_sfh-objs += amd_sfh_client.o

amd_sfh-objs += amd_sfh_client.o

amd_sfh-objs += amd_sfh_pcie.o

amd_sfh-objs += amd_sfh_pcie.o

amd_sfh-objs += hid_descriptor/amd_sfh_hid_desc.o

amd_sfh-objs += hid_descriptor/amd_sfh_hid_desc.o

amd_sfh-objs += sfh1_1/amd_sfh_init.o

amd_sfh-objs += sfh1_1/amd_sfh_interface.o

amd_sfh-objs += sfh1_1/amd_sfh_desc.o





ccflags-y += -I $(srctree)/$(src)/
 
ccflags-y += -I $(srctree)/$(src)/