Merge branch 'for-6.12/elan' into for-linus

- Add support for one new Elan device (ekth6a12nay) (Zhaoxiong Lv)
2026-04-21 04:53:46 -04:00 · 2024-09-13 15:27:27 +02:00
parent 54ab927352 d06651bebf
commit c9ce59650e
4 changed files with 16 additions and 49 deletions
--- 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