Skip to content

Commit

Permalink
dt-bindings: pinctrl: use pinctrl.yaml
Browse files Browse the repository at this point in the history
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: Rafał Miłecki <rafal@milecki.pl>
Reviewed-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20211202063216.24439-1-zajec5@gmail.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Rafał Miłecki authored and Linus Walleij committed Dec 5, 2021
1 parent 1288cad commit c09acbc
Show file tree
Hide file tree
Showing 58 changed files with 165 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,9 @@ patternProperties:

additionalProperties: false

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ allOf:
# boards are defining it at the moment so it would generate a lot of
# warnings.

- $ref: "pinctrl.yaml#"
- if:
properties:
compatible:
Expand Down
3 changes: 3 additions & 0 deletions Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ patternProperties:

additionalProperties: false

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ patternProperties:
TXD3, TXD4, UART6, USB11D1, USB11H2, USB2D1, USB2H1, USBCKI, VGABIOS_ROM,
VGAHS, VGAVS, VPI18, VPI24, VPI30, VPO12, VPO24, WDTRST1, WDTRST2]

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ patternProperties:
USB11BHID, USB2AD, USB2AH, USB2BD, USB2BH, USBCKI, VGABIOSROM, VGAHS,
VGAVS, VPI24, VPO, WDTRST1, WDTRST2]

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- aspeed,external-nodes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ patternProperties:
UART7, UART8, UART9, USBA, USBB, VB, VGAHS, VGAVS, WDTRST1, WDTRST2,
WDTRST3, WDTRST4]

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ patternProperties:
enum: [ gpio0, gpio1, gpio2, gpio3, gpio4, gpio5, gpio6, gpio7,
gpio8, gpio9, gpio10, gpio11, gpio12, gpio13, gpio40 ]

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ patternProperties:
vdsl_phy_override_1_grp, vdsl_phy_override_2_grp,
vdsl_phy_override_3_grp, dsl_gpio8, dsl_gpio9 ]

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ patternProperties:
gpio20, gpio25, gpio26, gpio27, gpio28, hsspi_cs1,
usb_port1 ]

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ patternProperties:
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 ]

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ patternProperties:
gpio15, gpio16, gpio17, gpio18, gpio19, gpio20, gpio21,
gpio22, gpio23, gpio24, gpio25, gpio26, gpio27, nand_grp ]

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ patternProperties:
gpio24, gpio25, gpio26, gpio27, gpio28, gpio29, gpio30,
gpio31, uart1_grp ]

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ patternProperties:
additionalProperties: false

allOf:
- $ref: "pinctrl.yaml#"
- if:
properties:
compatible:
Expand All @@ -77,7 +78,7 @@ additionalProperties: false

examples:
- |
pin-controller@1800c1c0 {
pinctrl@1800c1c0 {
compatible = "brcm,bcm4708-pinmux";
reg = <0x1800c1c0 0x24>;
reg-names = "cru_gpio_control";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@ patternProperties:

additionalProperties: false

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand All @@ -151,9 +154,9 @@ examples:
#include <dt-bindings/clock/k210-clk.h>
#include <dt-bindings/reset/k210-rst.h>
fpioa: pinmux@502B0000 {
fpioa: pinmux@502b0000 {
compatible = "canaan,k210-fpioa";
reg = <0x502B0000 0x100>;
reg = <0x502b0000 0x100>;
clocks = <&sysclk K210_CLK_FPIOA>,
<&sysclk K210_CLK_APB0>;
clock-names = "ref", "pclk";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,9 @@ properties:

additionalProperties: false

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- gpio-controller
Expand Down
3 changes: 3 additions & 0 deletions Documentation/devicetree/bindings/pinctrl/cirrus,madera.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ properties:

additionalProperties: false

allOf:
- $ref: "pinctrl.yaml#"

required:
- pinctrl-0
- pinctrl-names
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ patternProperties:

additionalProperties: false

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ patternProperties:

additionalProperties: false

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ patternProperties:

additionalProperties: false

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ patternProperties:

additionalProperties: false

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ patternProperties:

additionalProperties: false

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ maintainers:
- Paul Cercueil <paul@crapouillou.net>

properties:
nodename:
pattern: "^pinctrl@[0-9a-f]+$"

compatible:
oneOf:
- enum:
Expand Down Expand Up @@ -121,6 +118,9 @@ patternProperties:

additionalProperties: false

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down Expand Up @@ -169,7 +169,7 @@ additionalProperties:

examples:
- |
pin-controller@10010000 {
pinctrl@10010000 {
compatible = "ingenic,jz4770-pinctrl";
reg = <0x10010000 0x600>;
Expand Down
3 changes: 3 additions & 0 deletions Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ patternProperties:

additionalProperties: false

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ required:
- gpio-controller
- "#gpio-cells"

allOf:
- $ref: "pinctrl.yaml#"

patternProperties:
'-[0-9]+$':
type: object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ properties:
"#interrupt-cells":
const: 2

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ properties:
"#interrupt-cells":
const: 2

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ properties:
"#interrupt-cells":
const: 2

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ properties:
"#interrupt-cells":
const: 2

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ properties:
"#interrupt-cells":
const: 2

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down
3 changes: 3 additions & 0 deletions Documentation/devicetree/bindings/pinctrl/pinctrl-mt8192.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ patternProperties:

additionalProperties: false

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down
3 changes: 3 additions & 0 deletions Documentation/devicetree/bindings/pinctrl/pinctrl-mt8195.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,9 @@ patternProperties:

additionalProperties: false

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@ patternProperties:

additionalProperties: false

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ patternProperties:

additionalProperties: false

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ description: |
MDM9607 platform.
allOf:
- $ref: "pinctrl.yaml#"
- $ref: /schemas/pinctrl/qcom,tlmm-common.yaml#

properties:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ patternProperties:

additionalProperties: false

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@ patternProperties:

additionalProperties: false

allOf:
- $ref: "pinctrl.yaml#"

required:
- compatible
- reg
Expand Down
Loading

0 comments on commit c09acbc

Please sign in to comment.