summaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings/input
diff options
context:
space:
mode:
authorBenjamin Tissoires <bentiss@kernel.org>2024-09-13 15:27:27 +0200
committerBenjamin Tissoires <bentiss@kernel.org>2024-09-13 15:27:27 +0200
commitc9ce59650e5d57b986fdd4a599a46e28ccabb4d6 (patch)
treed7b946a0af361a0ba276cbbbaa60a7d8f8e38e8d /Documentation/devicetree/bindings/input
parent54ab9273529d24e36f0490c8acf00c1e50d09278 (diff)
parentd06651bebf99e51259ecfe9e63c42179abc1288c (diff)
downloadlinux-next-c9ce59650e5d57b986fdd4a599a46e28ccabb4d6.tar.gz
linux-next-c9ce59650e5d57b986fdd4a599a46e28ccabb4d6.zip
Merge branch 'for-6.12/elan' into for-linus
- Add support for one new Elan device (ekth6a12nay) (Zhaoxiong Lv)
Diffstat (limited to 'Documentation/devicetree/bindings/input')
-rw-r--r--Documentation/devicetree/bindings/input/elan,ekth6915.yaml4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/input/elan,ekth6915.yaml b/Documentation/devicetree/bindings/input/elan,ekth6915.yaml
index a62916d07a08..cb3e1801b0d3 100644
--- a/Documentation/devicetree/bindings/input/elan,ekth6915.yaml
+++ b/Documentation/devicetree/bindings/input/elan,ekth6915.yaml
@@ -23,7 +23,9 @@ properties:
- enum:
- elan,ekth5015m
- const: elan,ekth6915
- - const: elan,ekth6915
+ - enum:
+ - elan,ekth6915
+ - elan,ekth6a12nay
reg:
const: 0x10