Skip to contentSkip to conversation

dt-bindings: pinctrl: ocelot: convert pinctrl bindings to json-schema

PATCH In review Gregory CLEMENT 2 participants 2 messages Nov 13, 2020 – Nov 21, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dt-bindings: pinctrl: ocelot: convert pinctrl bindings to json-schema

Convert device tree bindings for Microsemi SoC (Ocelot, Luton, Serval, Jguar2, Sarx5) Pin Controller to YAML format

---
 .../bindings/pinctrl/mscc,ocelot-pinctrl.txt  | 41 ------------
 .../bindings/pinctrl/mscc,ocelot-pinctrl.yaml | 64 +++++++++++++++++++
 2 files changed, 64 insertions(+), 41 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.txt
 create mode 100644 Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.yaml
Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.txt deleted +0 -41
deleted file mode 100644
index db99bd95d423..000000000000
@@ -1,41 +0,0 @@
-Microsemi Ocelot pin controller Device Tree Bindings
-----------------------------------------------------
-
-Required properties:
- - compatible		: Should be "mscc,ocelot-pinctrl",
-			  "mscc,jaguar2-pinctrl", "microchip,sparx5-pinctrl",
-			  "mscc,luton-pinctrl" or "mscc,serval-pinctrl"
- - reg			: Address and length of the register set for the device
- - gpio-controller	: Indicates this device is a GPIO controller
- - #gpio-cells		: Must be 2.
-			  The first cell is the pin number and the
-			  second cell specifies GPIO flags, as defined in
-			  <dt-bindings/gpio/gpio.h>.
- - gpio-ranges		: Range of pins managed by the GPIO controller.
-
-
-The ocelot-pinctrl driver uses the generic pin multiplexing and generic pin
-configuration documented in pinctrl-bindings.txt.
-
-The following generic properties are supported:
- - function
- - pins
-
-Example:
-	gpio: pinctrl@71070034 {
-		compatible = "mscc,ocelot-pinctrl";
-		reg = <0x71070034 0x28>;
-		gpio-controller;
-		#gpio-cells = <2>;
-		gpio-ranges = <&gpio 0 0 22>;
-
-		uart_pins: uart-pins {
-				pins = "GPIO_6", "GPIO_7";
-				function = "uart";
-		};
-
-		uart2_pins: uart2-pins {
-				pins = "GPIO_12", "GPIO_13";
-				function = "uart2";
-		};
-	};
Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.yaml new file +64 -0

65 lines not on this page · raw message

Signature · 1 line
2.28.0
maintainer
#1 lore raw
Quoted 10 lines · Gregory CLEMENT

Convert device tree bindings for Microsemi SoC (Ocelot, Luton, Serval, Jguar2, Sarx5) Pin Controller to YAML format

---
 .../bindings/pinctrl/mscc,ocelot-pinctrl.txt  | 41 ------------
 .../bindings/pinctrl/mscc,ocelot-pinctrl.yaml | 64 +++++++++++++++++++
 2 files changed, 64 insertions(+), 41 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.txt
 create mode 100644 Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.yaml

Please resend Cc'ing Linus.

Quoted 49 lines
Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.yaml new file +43 -0
new file mode 100644
index 000000000000..b774b92becc8
@@ -0,0 +1,64 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/pinctrl/mscc,ocelot-pinctrl.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Microsemi Ocelot pin controller Device Tree Bindings
+
+maintainers:
+  - Alexandre Belloni <[email protected]>
+
+properties:
+  compatible:
+    enum:
+      - microchip,sparx5-pinctrl
+      - mscc,jaguar2-pinctrl
+      - mscc,luton-pinctrl
+      - mscc,ocelot-pinctrl
+      - mscc,serval-pinctrl
+
+  "#gpio-cells":
+    const: 2
+    description:
+      The first cell is the pin number and the second cell specifies
+      GPIO flags, as defined in <dt-bindings/gpio/gpio.h>.
+
+  reg:
+    maxItems: 1
+
+  gpio-controller: true
+
+  gpio-ranges:
+    maxItems: 1
+
+required:
+  - "#gpio-cells"
+  - compatible
+  - reg
+  - gpio-controller
+  - gpio-ranges
+
+additionalProperties: false
+

Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.yaml line 53

Quoted 10 lines
Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.yaml new file +10 -0
+examples:
+  - |
+    gpio: pinctrl@71070034 {
+        compatible = "mscc,ocelot-pinctrl";
+        reg = <0x71070034 0x28>;
+        gpio-controller;
+        #gpio-cells = <2>;
+                gpio-ranges = <&gpio 0 0 22>;
+
+        uart_pins: uart-pins {

You need to define '-pins$' under patternProperties. Without it, this doesn't pass validation.

Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.yaml line 55

Quoted 2 lines
Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.yaml new file +2 -0
+        		pins = "GPIO_6", "GPIO_7";
+        		function = "uart";

mixed tabs and spaces. YAML wants spaces.

Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.yaml line 64

Quoted 10 lines
Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.yaml new file +9 -0
+        };
+
+        uart2_pins: uart2-pins {
+        		pins = "GPIO_12", "GPIO_13";
+        		function = "uart2";
+        };
+    };
+
+...
\ No newline at end of file

Fix this.