diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2024-05-22 17:39:34 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2024-05-22 17:39:34 -0700 |
| commit | 2ec0028a1cadfb88d912435c1eb1ac5de76071f0 (patch) | |
| tree | b60ed6b29f5fba75d6f1c18c832aa6596a23d008 /Documentation | |
| parent | 0537c8eef4f699aacdeb67c6181c66cccd63c7f5 (diff) | |
| parent | 832f54c9ccd3a3f32d1db905462d3c58b4df52bd (diff) | |
| download | linux-2ec0028a1cadfb88d912435c1eb1ac5de76071f0.tar.gz linux-2ec0028a1cadfb88d912435c1eb1ac5de76071f0.tar.bz2 linux-2ec0028a1cadfb88d912435c1eb1ac5de76071f0.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 6.10 merge window.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml | 16 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.yaml | 2 |
2 files changed, 14 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml b/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml index c8832cd0d7da..2025d6a5423e 100644 --- a/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml +++ b/Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml @@ -11,10 +11,18 @@ maintainers: properties: compatible: - enum: - - qcom,pm8058-vib - - qcom,pm8916-vib - - qcom,pm8921-vib + oneOf: + - enum: + - qcom,pm8058-vib + - qcom,pm8916-vib + - qcom,pm8921-vib + - qcom,pmi632-vib + - items: + - enum: + - qcom,pm7250b-vib + - qcom,pm7325b-vib + - qcom,pm7550ba-vib + - const: qcom,pmi632-vib reg: maxItems: 1 diff --git a/Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.yaml b/Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.yaml index f2808cb4d99d..745e57c05176 100644 --- a/Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.yaml +++ b/Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.yaml @@ -39,7 +39,9 @@ properties: - edt,edt-ft5406 - edt,edt-ft5506 - evervision,ev-ft5726 + - focaltech,ft5452 - focaltech,ft6236 + - focaltech,ft8719 reg: maxItems: 1 |