From: Conor Dooley <conor.dooley@microchip.com>
Date: Tue, 10 Mar 2026 17:58:27 +0000 (+0000)
Subject: dt-bindings: pinctrl: pincfg-node: permit bias-high-impedance with other bias properties
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91910a4047e4d3c85e140604c9b75097bb8f0329;p=thirdparty%2Flinux.git

dt-bindings: pinctrl: pincfg-node: permit bias-high-impedance with other bias properties

It is possible that devices tristate buffers may set the buffer to
the high-Z state in addition to setting pull-up or pull-down on a pin.
Remove this particular restriction to prevent warning on zynqmp systems
where this configuration seems to be valid.

Reported-by: Rob Herring (Arm) <robh@kernel.org>
Fixes: a901e8705f89f ("dt-bindings: pinctrl: pincfg-node: add restrictions on conflicting properties")
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
Signed-off-by: Linus Walleij <linusw@kernel.org>
---

diff --git a/Documentation/devicetree/bindings/pinctrl/pincfg-node.yaml b/Documentation/devicetree/bindings/pinctrl/pincfg-node.yaml
index fe936ab09104..981f45c2f56b 100644
--- a/Documentation/devicetree/bindings/pinctrl/pincfg-node.yaml
+++ b/Documentation/devicetree/bindings/pinctrl/pincfg-node.yaml
@@ -236,8 +236,6 @@ allOf:
       anyOf:
         - required:
             - bias-disable
-        - required:
-            - bias-high-impedance
         - required:
             - bias-bus-hold
         - required:
@@ -250,8 +248,6 @@ allOf:
       oneOf:
         - required:
             - bias-disable
-        - required:
-            - bias-high-impedance
         - required:
             - bias-bus-hold
         - required: