Commit c7bf0a0f authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'devicetree-fixes-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

Pull Devicetree fixes from Rob Herring:
 "Fix several warnings/errors in validation of binding schemas"

* tag 'devicetree-fixes-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: pinctrl: stm32: Fix missing 'clocks' property in examples
  dt-bindings: iio: ad7124: Fix dtc warnings in example
  dt-bindings: iio: avia-hx711: Fix avdd-supply typo in example
  dt-bindings: pinctrl: aspeed: Fix AST2500 example errors
  dt-bindings: pinctrl: aspeed: Fix 'compatible' schema errors
  dt-bindings: riscv: Limit cpus schema to only check RiscV 'cpu' nodes
  dt-bindings: Ensure child nodes are of type 'object'
parents d6788eb7 e2297f7c
...@@ -42,6 +42,7 @@ properties: ...@@ -42,6 +42,7 @@ properties:
patternProperties: patternProperties:
"^.*@[0-9a-fA-F]+$": "^.*@[0-9a-fA-F]+$":
type: object
properties: properties:
reg: reg:
maxItems: 1 maxItems: 1
......
...@@ -114,6 +114,10 @@ patternProperties: ...@@ -114,6 +114,10 @@ patternProperties:
examples: examples:
- | - |
spi {
#address-cells = <1>;
#size-cells = <0>;
adc@0 { adc@0 {
compatible = "adi,ad7124-4"; compatible = "adi,ad7124-4";
reg = <0>; reg = <0>;
...@@ -153,3 +157,4 @@ examples: ...@@ -153,3 +157,4 @@ examples:
diff-channels = <6 7>; diff-channels = <6 7>;
}; };
}; };
};
...@@ -61,6 +61,6 @@ examples: ...@@ -61,6 +61,6 @@ examples:
compatible = "avia,hx711"; compatible = "avia,hx711";
sck-gpios = <&gpio3 10 GPIO_ACTIVE_HIGH>; sck-gpios = <&gpio3 10 GPIO_ACTIVE_HIGH>;
dout-gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; dout-gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
avdd-suppy = <&avdd>; avdd-supply = <&avdd>;
clock-frequency = <100000>; clock-frequency = <100000>;
}; };
...@@ -55,6 +55,7 @@ patternProperties: ...@@ -55,6 +55,7 @@ patternProperties:
"^pinctrl-[0-9]+$": true "^pinctrl-[0-9]+$": true
"^nand@[a-f0-9]+$": "^nand@[a-f0-9]+$":
type: object
properties: properties:
reg: reg:
minimum: 0 minimum: 0
......
...@@ -40,6 +40,7 @@ properties: ...@@ -40,6 +40,7 @@ properties:
patternProperties: patternProperties:
"^nand@[a-f0-9]$": "^nand@[a-f0-9]$":
type: object
properties: properties:
reg: reg:
description: description:
......
...@@ -22,7 +22,9 @@ description: |+ ...@@ -22,7 +22,9 @@ description: |+
properties: properties:
compatible: compatible:
enum: [ aspeed,ast2400-pinctrl, aspeed,g4-pinctrl ] enum:
- aspeed,ast2400-pinctrl
- aspeed,g4-pinctrl
patternProperties: patternProperties:
'^.*$': '^.*$':
......
...@@ -22,7 +22,9 @@ description: |+ ...@@ -22,7 +22,9 @@ description: |+
properties: properties:
compatible: compatible:
enum: [ aspeed,ast2500-pinctrl, aspeed,g5-pinctrl ] enum:
- aspeed,ast2500-pinctrl
- aspeed,g5-pinctrl
aspeed,external-nodes: aspeed,external-nodes:
minItems: 2 minItems: 2
maxItems: 2 maxItems: 2
...@@ -74,9 +76,6 @@ required: ...@@ -74,9 +76,6 @@ required:
examples: examples:
- | - |
compatible = "simple-bus";
ranges;
apb { apb {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
...@@ -89,7 +88,7 @@ examples: ...@@ -89,7 +88,7 @@ examples:
pinctrl: pinctrl { pinctrl: pinctrl {
compatible = "aspeed,g5-pinctrl"; compatible = "aspeed,g5-pinctrl";
aspeed,external-nodes = <&gfx &lhc>; aspeed,external-nodes = <&gfx>, <&lhc>;
pinctrl_i2c3_default: i2c3_default { pinctrl_i2c3_default: i2c3_default {
function = "I2C3"; function = "I2C3";
......
...@@ -55,6 +55,7 @@ properties: ...@@ -55,6 +55,7 @@ properties:
patternProperties: patternProperties:
'^gpio@[0-9a-f]*$': '^gpio@[0-9a-f]*$':
type: object
properties: properties:
gpio-controller: true gpio-controller: true
'#gpio-cells': '#gpio-cells':
...@@ -113,8 +114,10 @@ patternProperties: ...@@ -113,8 +114,10 @@ patternProperties:
- st,bank-name - st,bank-name
'-[0-9]*$': '-[0-9]*$':
type: object
patternProperties: patternProperties:
'^pins': '^pins':
type: object
description: | description: |
A pinctrl node should contain at least one subnode representing the A pinctrl node should contain at least one subnode representing the
pinctrl group available on the machine. Each subnode will list the pinctrl group available on the machine. Each subnode will list the
...@@ -194,6 +197,7 @@ required: ...@@ -194,6 +197,7 @@ required:
examples: examples:
- | - |
#include <dt-bindings/pinctrl/stm32-pinfunc.h> #include <dt-bindings/pinctrl/stm32-pinfunc.h>
#include <dt-bindings/mfd/stm32f4-rcc.h>
//Example 1 //Example 1
pinctrl@40020000 { pinctrl@40020000 {
#address-cells = <1>; #address-cells = <1>;
...@@ -207,6 +211,7 @@ examples: ...@@ -207,6 +211,7 @@ examples:
#gpio-cells = <2>; #gpio-cells = <2>;
reg = <0x0 0x400>; reg = <0x0 0x400>;
resets = <&reset_ahb1 0>; resets = <&reset_ahb1 0>;
clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOA)>;
st,bank-name = "GPIOA"; st,bank-name = "GPIOA";
}; };
}; };
...@@ -224,6 +229,7 @@ examples: ...@@ -224,6 +229,7 @@ examples:
#gpio-cells = <2>; #gpio-cells = <2>;
reg = <0x1000 0x400>; reg = <0x1000 0x400>;
resets = <&reset_ahb1 0>; resets = <&reset_ahb1 0>;
clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOB)>;
st,bank-name = "GPIOB"; st,bank-name = "GPIOB";
gpio-ranges = <&pinctrl 0 0 16>; gpio-ranges = <&pinctrl 0 0 16>;
}; };
...@@ -233,6 +239,7 @@ examples: ...@@ -233,6 +239,7 @@ examples:
#gpio-cells = <2>; #gpio-cells = <2>;
reg = <0x2000 0x400>; reg = <0x2000 0x400>;
resets = <&reset_ahb1 0>; resets = <&reset_ahb1 0>;
clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOC)>;
st,bank-name = "GPIOC"; st,bank-name = "GPIOC";
ngpios = <5>; ngpios = <5>;
gpio-ranges = <&pinctrl 0 16 3>, gpio-ranges = <&pinctrl 0 16 3>,
......
...@@ -10,29 +10,8 @@ maintainers: ...@@ -10,29 +10,8 @@ maintainers:
- Paul Walmsley <paul.walmsley@sifive.com> - Paul Walmsley <paul.walmsley@sifive.com>
- Palmer Dabbelt <palmer@sifive.com> - Palmer Dabbelt <palmer@sifive.com>
allOf:
- $ref: /schemas/cpus.yaml#
properties: properties:
$nodename:
const: cpus
description: Container of cpu nodes
'#address-cells':
const: 1
description: |
A single unsigned 32-bit integer uniquely identifies each RISC-V
hart in a system. (See the "reg" node under the "cpu" node,
below).
'#size-cells':
const: 0
patternProperties:
'^cpu@[0-9a-f]+$':
properties:
compatible: compatible:
type: array
items: items:
- enum: - enum:
- sifive,rocket0 - sifive,rocket0
...@@ -96,7 +75,7 @@ patternProperties: ...@@ -96,7 +75,7 @@ patternProperties:
- compatible - compatible
- interrupt-controller - interrupt-controller
required: required:
- riscv,isa - riscv,isa
- timebase-frequency - timebase-frequency
- interrupt-controller - interrupt-controller
......
...@@ -50,6 +50,7 @@ properties: ...@@ -50,6 +50,7 @@ properties:
patternProperties: patternProperties:
"^.*@[0-9a-f]+": "^.*@[0-9a-f]+":
type: object
properties: properties:
reg: reg:
items: items:
......
...@@ -55,6 +55,7 @@ properties: ...@@ -55,6 +55,7 @@ properties:
patternProperties: patternProperties:
"^.*@[0-9a-f]+": "^.*@[0-9a-f]+":
type: object
properties: properties:
reg: reg:
items: items:
......
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