-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'for-linus-2022080201' of git://git.kernel.org/pub/scm/linu…
…x/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 ...
- Loading branch information
Showing
42 changed files
with
2,066 additions
and
208 deletions.
There are no files selected for viewing
65 changes: 65 additions & 0 deletions
65
Documentation/devicetree/bindings/input/elan,ekth6915.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
# 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>; | ||
}; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
CONFIG_KUNIT=y | ||
CONFIG_USB=y | ||
CONFIG_USB_HID=y | ||
CONFIG_HID_UCLOGIC=y | ||
CONFIG_HID_KUNIT_TEST=y |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.