diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-09-06 00:08:14 +0300 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-09-06 00:08:14 +0300 |
commit | 34069d12e239ae8f36dd96c378e4622fb1c42a76 (patch) | |
tree | b33fabf1a4cc7530e93ab416f3156bdfe601a3a0 /Documentation/devicetree/bindings/input | |
parent | 54116d442e001e1b6bd482122043b1870998a1f3 (diff) | |
parent | 2dde18cd1d8fac735875f2e4987f11817cc0bc2c (diff) | |
download | linux-34069d12e239ae8f36dd96c378e4622fb1c42a76.tar.xz |
Merge tag 'v6.5' into next
Sync up with mainline to bring in updates to the shared infrastructure.
Diffstat (limited to 'Documentation/devicetree/bindings/input')
-rw-r--r-- | Documentation/devicetree/bindings/input/goodix,gt7375p.yaml | 9 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/input/mediatek,pmic-keys.yaml | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/input/goodix,gt7375p.yaml b/Documentation/devicetree/bindings/input/goodix,gt7375p.yaml index ce18d7dadae2..1edad1da1196 100644 --- a/Documentation/devicetree/bindings/input/goodix,gt7375p.yaml +++ b/Documentation/devicetree/bindings/input/goodix,gt7375p.yaml @@ -43,6 +43,15 @@ properties: itself as long as it allows the main board to make signals compatible with what the touchscreen is expecting for its IO rails. + goodix,no-reset-during-suspend: + description: + Set this to true to enforce the driver to not assert the reset GPIO + during suspend. + Due to potential touchscreen hardware flaw, back-powering could happen in + suspend if the power supply is on and with active-low reset GPIO asserted. + This property is used to avoid the back-powering issue. + type: boolean + required: - compatible - reg diff --git a/Documentation/devicetree/bindings/input/mediatek,pmic-keys.yaml b/Documentation/devicetree/bindings/input/mediatek,pmic-keys.yaml index 037c3ae9f1c3..e34c9e78d38d 100644 --- a/Documentation/devicetree/bindings/input/mediatek,pmic-keys.yaml +++ b/Documentation/devicetree/bindings/input/mediatek,pmic-keys.yaml @@ -55,7 +55,7 @@ patternProperties: interrupt-names: true - linux-keycodes: + linux,keycodes: maxItems: 1 wakeup-source: true |