Commit c09acbc4 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Linus Walleij

dt-bindings: pinctrl: use pinctrl.yaml

Also fix some examples to avoid warnings like:
brcm,ns-pinmux.example.dt.yaml: pin-controller@1800c1c0: $nodename:0: 'pin-controller@1800c1c0' does not match '^pinctrl|pinmux@[0-9a-f]+$'
Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20211202063216.24439-1-zajec5@gmail.comSigned-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 1288cadc
...@@ -184,6 +184,9 @@ patternProperties: ...@@ -184,6 +184,9 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -147,6 +147,7 @@ allOf: ...@@ -147,6 +147,7 @@ allOf:
# boards are defining it at the moment so it would generate a lot of # boards are defining it at the moment so it would generate a lot of
# warnings. # warnings.
- $ref: "pinctrl.yaml#"
- if: - if:
properties: properties:
compatible: compatible:
......
...@@ -67,6 +67,9 @@ patternProperties: ...@@ -67,6 +67,9 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -50,6 +50,9 @@ patternProperties: ...@@ -50,6 +50,9 @@ patternProperties:
TXD3, TXD4, UART6, USB11D1, USB11H2, USB2D1, USB2H1, USBCKI, VGABIOS_ROM, TXD3, TXD4, UART6, USB11D1, USB11H2, USB2D1, USB2H1, USBCKI, VGABIOS_ROM,
VGAHS, VGAVS, VPI18, VPI24, VPI30, VPO12, VPO24, WDTRST1, WDTRST2] VGAHS, VGAVS, VPI18, VPI24, VPI30, VPO12, VPO24, WDTRST1, WDTRST2]
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
......
...@@ -62,6 +62,9 @@ patternProperties: ...@@ -62,6 +62,9 @@ patternProperties:
USB11BHID, USB2AD, USB2AH, USB2BD, USB2BH, USBCKI, VGABIOSROM, VGAHS, USB11BHID, USB2AD, USB2AH, USB2BD, USB2BH, USBCKI, VGABIOSROM, VGAHS,
VGAVS, VPI24, VPO, WDTRST1, WDTRST2] VGAVS, VPI24, VPO, WDTRST1, WDTRST2]
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- aspeed,external-nodes - aspeed,external-nodes
......
...@@ -83,6 +83,9 @@ patternProperties: ...@@ -83,6 +83,9 @@ patternProperties:
UART7, UART8, UART9, USBA, USBB, VB, VGAHS, VGAVS, WDTRST1, WDTRST2, UART7, UART8, UART9, USBA, USBB, VB, VGAHS, VGAVS, WDTRST1, WDTRST2,
WDTRST3, WDTRST4] WDTRST3, WDTRST4]
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
......
...@@ -37,6 +37,9 @@ patternProperties: ...@@ -37,6 +37,9 @@ patternProperties:
enum: [ gpio0, gpio1, gpio2, gpio3, gpio4, gpio5, gpio6, gpio7, enum: [ gpio0, gpio1, gpio2, gpio3, gpio4, gpio5, gpio6, gpio7,
gpio8, gpio9, gpio10, gpio11, gpio12, gpio13, gpio40 ] gpio8, gpio9, gpio10, gpio11, gpio12, gpio13, gpio40 ]
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -41,6 +41,9 @@ patternProperties: ...@@ -41,6 +41,9 @@ patternProperties:
vdsl_phy_override_1_grp, vdsl_phy_override_2_grp, vdsl_phy_override_1_grp, vdsl_phy_override_2_grp,
vdsl_phy_override_3_grp, dsl_gpio8, dsl_gpio9 ] vdsl_phy_override_3_grp, dsl_gpio8, dsl_gpio9 ]
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -36,6 +36,9 @@ patternProperties: ...@@ -36,6 +36,9 @@ patternProperties:
gpio20, gpio25, gpio26, gpio27, gpio28, hsspi_cs1, gpio20, gpio25, gpio26, gpio27, gpio28, hsspi_cs1,
usb_port1 ] usb_port1 ]
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -34,6 +34,9 @@ patternProperties: ...@@ -34,6 +34,9 @@ patternProperties:
enum: [ ebi_cs_grp, uart1_grp, serial_led_grp, legacy_led_grp, enum: [ ebi_cs_grp, uart1_grp, serial_led_grp, legacy_led_grp,
led_grp, spi_cs_grp, utopia_grp, pwm_syn_clk, sys_irq_grp ] led_grp, spi_cs_grp, utopia_grp, pwm_syn_clk, sys_irq_grp ]
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -41,6 +41,9 @@ patternProperties: ...@@ -41,6 +41,9 @@ patternProperties:
gpio15, gpio16, gpio17, gpio18, gpio19, gpio20, gpio21, gpio15, gpio16, gpio17, gpio18, gpio19, gpio20, gpio21,
gpio22, gpio23, gpio24, gpio25, gpio26, gpio27, nand_grp ] gpio22, gpio23, gpio24, gpio25, gpio26, gpio27, nand_grp ]
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -42,6 +42,9 @@ patternProperties: ...@@ -42,6 +42,9 @@ patternProperties:
gpio24, gpio25, gpio26, gpio27, gpio28, gpio29, gpio30, gpio24, gpio25, gpio26, gpio27, gpio28, gpio29, gpio30,
gpio31, uart1_grp ] gpio31, uart1_grp ]
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -53,6 +53,7 @@ patternProperties: ...@@ -53,6 +53,7 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf: allOf:
- $ref: "pinctrl.yaml#"
- if: - if:
properties: properties:
compatible: compatible:
...@@ -77,7 +78,7 @@ additionalProperties: false ...@@ -77,7 +78,7 @@ additionalProperties: false
examples: examples:
- | - |
pin-controller@1800c1c0 { pinctrl@1800c1c0 {
compatible = "brcm,bcm4708-pinmux"; compatible = "brcm,bcm4708-pinmux";
reg = <0x1800c1c0 0x24>; reg = <0x1800c1c0 0x24>;
reg-names = "cru_gpio_control"; reg-names = "cru_gpio_control";
......
...@@ -137,6 +137,9 @@ patternProperties: ...@@ -137,6 +137,9 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
...@@ -151,9 +154,9 @@ examples: ...@@ -151,9 +154,9 @@ examples:
#include <dt-bindings/clock/k210-clk.h> #include <dt-bindings/clock/k210-clk.h>
#include <dt-bindings/reset/k210-rst.h> #include <dt-bindings/reset/k210-rst.h>
fpioa: pinmux@502B0000 { fpioa: pinmux@502b0000 {
compatible = "canaan,k210-fpioa"; compatible = "canaan,k210-fpioa";
reg = <0x502B0000 0x100>; reg = <0x502b0000 0x100>;
clocks = <&sysclk K210_CLK_FPIOA>, clocks = <&sysclk K210_CLK_FPIOA>,
<&sysclk K210_CLK_APB0>; <&sysclk K210_CLK_APB0>;
clock-names = "ref", "pclk"; clock-names = "ref", "pclk";
......
...@@ -181,6 +181,9 @@ properties: ...@@ -181,6 +181,9 @@ properties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- gpio-controller - gpio-controller
......
...@@ -117,6 +117,9 @@ properties: ...@@ -117,6 +117,9 @@ properties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- pinctrl-0 - pinctrl-0
- pinctrl-names - pinctrl-names
......
...@@ -58,6 +58,9 @@ patternProperties: ...@@ -58,6 +58,9 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -58,6 +58,9 @@ patternProperties: ...@@ -58,6 +58,9 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -58,6 +58,9 @@ patternProperties: ...@@ -58,6 +58,9 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -58,6 +58,9 @@ patternProperties: ...@@ -58,6 +58,9 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -56,6 +56,9 @@ patternProperties: ...@@ -56,6 +56,9 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -28,9 +28,6 @@ maintainers: ...@@ -28,9 +28,6 @@ maintainers:
- Paul Cercueil <paul@crapouillou.net> - Paul Cercueil <paul@crapouillou.net>
properties: properties:
nodename:
pattern: "^pinctrl@[0-9a-f]+$"
compatible: compatible:
oneOf: oneOf:
- enum: - enum:
...@@ -121,6 +118,9 @@ patternProperties: ...@@ -121,6 +118,9 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
...@@ -169,7 +169,7 @@ additionalProperties: ...@@ -169,7 +169,7 @@ additionalProperties:
examples: examples:
- | - |
pin-controller@10010000 { pinctrl@10010000 {
compatible = "ingenic,jz4770-pinctrl"; compatible = "ingenic,jz4770-pinctrl";
reg = <0x10010000 0x600>; reg = <0x10010000 0x600>;
......
...@@ -47,6 +47,9 @@ patternProperties: ...@@ -47,6 +47,9 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -64,6 +64,9 @@ required: ...@@ -64,6 +64,9 @@ required:
- gpio-controller - gpio-controller
- "#gpio-cells" - "#gpio-cells"
allOf:
- $ref: "pinctrl.yaml#"
patternProperties: patternProperties:
'-[0-9]+$': '-[0-9]+$':
type: object type: object
......
...@@ -59,6 +59,9 @@ properties: ...@@ -59,6 +59,9 @@ properties:
"#interrupt-cells": "#interrupt-cells":
const: 2 const: 2
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -45,6 +45,9 @@ properties: ...@@ -45,6 +45,9 @@ properties:
"#interrupt-cells": "#interrupt-cells":
const: 2 const: 2
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -42,6 +42,9 @@ properties: ...@@ -42,6 +42,9 @@ properties:
"#interrupt-cells": "#interrupt-cells":
const: 2 const: 2
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -56,6 +56,9 @@ properties: ...@@ -56,6 +56,9 @@ properties:
"#interrupt-cells": "#interrupt-cells":
const: 2 const: 2
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -56,6 +56,9 @@ properties: ...@@ -56,6 +56,9 @@ properties:
"#interrupt-cells": "#interrupt-cells":
const: 2 const: 2
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -108,6 +108,9 @@ patternProperties: ...@@ -108,6 +108,9 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -187,6 +187,9 @@ patternProperties: ...@@ -187,6 +187,9 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -118,6 +118,9 @@ patternProperties: ...@@ -118,6 +118,9 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -103,6 +103,9 @@ patternProperties: ...@@ -103,6 +103,9 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -14,6 +14,7 @@ description: | ...@@ -14,6 +14,7 @@ description: |
MDM9607 platform. MDM9607 platform.
allOf: allOf:
- $ref: "pinctrl.yaml#"
- $ref: /schemas/pinctrl/qcom,tlmm-common.yaml# - $ref: /schemas/pinctrl/qcom,tlmm-common.yaml#
properties: properties:
......
...@@ -97,6 +97,9 @@ patternProperties: ...@@ -97,6 +97,9 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -133,6 +133,9 @@ patternProperties: ...@@ -133,6 +133,9 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -118,6 +118,9 @@ patternProperties: ...@@ -118,6 +118,9 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -123,6 +123,9 @@ patternProperties: ...@@ -123,6 +123,9 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -14,6 +14,7 @@ description: | ...@@ -14,6 +14,7 @@ description: |
SC8180X platform. SC8180X platform.
allOf: allOf:
- $ref: "pinctrl.yaml#"
- $ref: /schemas/pinctrl/qcom,tlmm-common.yaml# - $ref: /schemas/pinctrl/qcom,tlmm-common.yaml#
properties: properties:
......
...@@ -118,6 +118,9 @@ patternProperties: ...@@ -118,6 +118,9 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -121,6 +121,9 @@ patternProperties: ...@@ -121,6 +121,9 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -13,6 +13,7 @@ description: | ...@@ -13,6 +13,7 @@ description: |
in the SM6125 platform. in the SM6125 platform.
allOf: allOf:
- $ref: "pinctrl.yaml#"
- $ref: /schemas/pinctrl/qcom,tlmm-common.yaml# - $ref: /schemas/pinctrl/qcom,tlmm-common.yaml#
properties: properties:
......
...@@ -14,6 +14,7 @@ description: | ...@@ -14,6 +14,7 @@ description: |
in the SM6350 platform. in the SM6350 platform.
allOf: allOf:
- $ref: "pinctrl.yaml#"
- $ref: /schemas/pinctrl/qcom,tlmm-common.yaml# - $ref: /schemas/pinctrl/qcom,tlmm-common.yaml#
properties: properties:
......
...@@ -115,6 +115,9 @@ patternProperties: ...@@ -115,6 +115,9 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -14,6 +14,7 @@ description: | ...@@ -14,6 +14,7 @@ description: |
in the SM8350 platform. in the SM8350 platform.
allOf: allOf:
- $ref: "pinctrl.yaml#"
- $ref: /schemas/pinctrl/qcom,tlmm-common.yaml# - $ref: /schemas/pinctrl/qcom,tlmm-common.yaml#
properties: properties:
......
...@@ -51,6 +51,9 @@ properties: ...@@ -51,6 +51,9 @@ properties:
should not be accessed by the OS. Please see the ../gpio/gpio.txt for more should not be accessed by the OS. Please see the ../gpio/gpio.txt for more
information. information.
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- interrupts - interrupts
- interrupt-controller - interrupt-controller
......
...@@ -44,6 +44,9 @@ patternProperties: ...@@ -44,6 +44,9 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
......
...@@ -70,6 +70,9 @@ properties: ...@@ -70,6 +70,9 @@ properties:
power-domains: power-domains:
maxItems: 1 maxItems: 1
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -31,6 +31,9 @@ properties: ...@@ -31,6 +31,9 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -72,6 +72,9 @@ patternProperties: ...@@ -72,6 +72,9 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -90,6 +90,9 @@ additionalProperties: ...@@ -90,6 +90,9 @@ additionalProperties:
additionalProperties: additionalProperties:
$ref: "#/additionalProperties/anyOf/0" $ref: "#/additionalProperties/anyOf/0"
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -31,6 +31,9 @@ properties: ...@@ -31,6 +31,9 @@ properties:
description: description:
The bus clock, sometimes described as pclk, for register accesses. The bus clock, sometimes described as pclk, for register accesses.
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -67,6 +67,9 @@ properties: ...@@ -67,6 +67,9 @@ properties:
ranges: true ranges: true
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- rockchip,grf - rockchip,grf
......
...@@ -10,9 +10,6 @@ maintainers: ...@@ -10,9 +10,6 @@ maintainers:
- Masahiro Yamada <yamada.masahiro@socionext.com> - Masahiro Yamada <yamada.masahiro@socionext.com>
properties: properties:
$nodename:
pattern: "pinctrl"
compatible: compatible:
enum: enum:
- socionext,uniphier-ld4-pinctrl - socionext,uniphier-ld4-pinctrl
...@@ -62,6 +59,9 @@ additionalProperties: ...@@ -62,6 +59,9 @@ additionalProperties:
unevaluatedProperties: false unevaluatedProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
......
...@@ -183,6 +183,9 @@ patternProperties: ...@@ -183,6 +183,9 @@ patternProperties:
required: required:
- pinmux - pinmux
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- '#address-cells' - '#address-cells'
......
...@@ -20,6 +20,9 @@ properties: ...@@ -20,6 +20,9 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
...@@ -80,7 +83,7 @@ examples: ...@@ -80,7 +83,7 @@ examples:
#address-cells = <2>; #address-cells = <2>;
#size-cells = <2>; #size-cells = <2>;
pmux: pmux@24190000 { pmux: pinmux@24190000 {
compatible = "toshiba,tmpv7708-pinctrl"; compatible = "toshiba,tmpv7708-pinctrl";
reg = <0 0x24190000 0 0x10000>; reg = <0 0x24190000 0 0x10000>;
......
...@@ -167,6 +167,9 @@ patternProperties: ...@@ -167,6 +167,9 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: "pinctrl.yaml#"
required: required:
- compatible - compatible
- reg - reg
......
...@@ -290,6 +290,9 @@ patternProperties: ...@@ -290,6 +290,9 @@ patternProperties:
additionalProperties: false additionalProperties: false
allOf:
- $ref: pinctrl.yaml#
required: required:
- compatible - compatible
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment