From: Paul Cercueil <paul@crapouillou.net>
Date: Mon, 20 Jul 2020 15:45:48 +0000 (+0200)
Subject: dt-bindings: ingenic,pinctrl: Support pinmux/pinconf nodes
X-Git-Tag: v5.9-rc1~77^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66c00f561d94f8b5eae8c0e1aa8e4cfad9cf64f9;p=thirdparty%2Flinux.git

dt-bindings: ingenic,pinctrl: Support pinmux/pinconf nodes

Add YAML to describe the pinmux/pinconf sub-nodes of the pinctrl IP on
Ingenic SoCs.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20200720154548.12453-1-paul@crapouillou.net
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---

diff --git a/Documentation/devicetree/bindings/pinctrl/ingenic,pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/ingenic,pinctrl.yaml
index 5be2b1e95b360..18163fb69ce72 100644
--- a/Documentation/devicetree/bindings/pinctrl/ingenic,pinctrl.yaml
+++ b/Documentation/devicetree/bindings/pinctrl/ingenic,pinctrl.yaml
@@ -110,6 +110,46 @@ required:
   - "#address-cells"
   - "#size-cells"
 
+additionalProperties:
+  anyOf:
+    - type: object
+      allOf:
+        - $ref: pincfg-node.yaml#
+        - $ref: pinmux-node.yaml#
+
+      properties:
+        phandle: true
+        function: true
+        groups: true
+        pins: true
+        bias-disable: true
+        bias-pull-up: true
+        bias-pull-down: true
+        output-low: true
+        output-high: true
+      additionalProperties: false
+
+    - type: object
+      properties:
+        phandle: true
+      additionalProperties:
+        type: object
+        allOf:
+          - $ref: pincfg-node.yaml#
+          - $ref: pinmux-node.yaml#
+
+        properties:
+          phandle: true
+          function: true
+          groups: true
+          pins: true
+          bias-disable: true
+          bias-pull-up: true
+          bias-pull-down: true
+          output-low: true
+          output-high: true
+        additionalProperties: false
+
 examples:
   - |
     pin-controller@10010000 {