Skip to content

Commit c7bf0a0

Browse files
committed
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'
2 parents d6788eb + e2297f7 commit c7bf0a0

11 files changed

+119
-122
lines changed

Documentation/devicetree/bindings/bus/allwinner,sun8i-a23-rsb.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ properties:
4242

4343
patternProperties:
4444
"^.*@[0-9a-fA-F]+$":
45+
type: object
4546
properties:
4647
reg:
4748
maxItems: 1

Documentation/devicetree/bindings/iio/adc/adi,ad7124.yaml

Lines changed: 38 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -114,42 +114,47 @@ patternProperties:
114114

115115
examples:
116116
- |
117-
adc@0 {
118-
compatible = "adi,ad7124-4";
119-
reg = <0>;
120-
spi-max-frequency = <5000000>;
121-
interrupts = <25 2>;
122-
interrupt-parent = <&gpio>;
123-
refin1-supply = <&adc_vref>;
124-
clocks = <&ad7124_mclk>;
125-
clock-names = "mclk";
126-
117+
spi {
127118
#address-cells = <1>;
128119
#size-cells = <0>;
129120
130-
channel@0 {
121+
adc@0 {
122+
compatible = "adi,ad7124-4";
131123
reg = <0>;
132-
diff-channels = <0 1>;
133-
adi,reference-select = <0>;
134-
adi,buffered-positive;
135-
};
136-
137-
channel@1 {
138-
reg = <1>;
139-
bipolar;
140-
diff-channels = <2 3>;
141-
adi,reference-select = <0>;
142-
adi,buffered-positive;
143-
adi,buffered-negative;
144-
};
145-
146-
channel@2 {
147-
reg = <2>;
148-
diff-channels = <4 5>;
149-
};
150-
151-
channel@3 {
152-
reg = <3>;
153-
diff-channels = <6 7>;
124+
spi-max-frequency = <5000000>;
125+
interrupts = <25 2>;
126+
interrupt-parent = <&gpio>;
127+
refin1-supply = <&adc_vref>;
128+
clocks = <&ad7124_mclk>;
129+
clock-names = "mclk";
130+
131+
#address-cells = <1>;
132+
#size-cells = <0>;
133+
134+
channel@0 {
135+
reg = <0>;
136+
diff-channels = <0 1>;
137+
adi,reference-select = <0>;
138+
adi,buffered-positive;
139+
};
140+
141+
channel@1 {
142+
reg = <1>;
143+
bipolar;
144+
diff-channels = <2 3>;
145+
adi,reference-select = <0>;
146+
adi,buffered-positive;
147+
adi,buffered-negative;
148+
};
149+
150+
channel@2 {
151+
reg = <2>;
152+
diff-channels = <4 5>;
153+
};
154+
155+
channel@3 {
156+
reg = <3>;
157+
diff-channels = <6 7>;
158+
};
154159
};
155160
};

Documentation/devicetree/bindings/iio/adc/avia-hx711.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ examples:
6161
compatible = "avia,hx711";
6262
sck-gpios = <&gpio3 10 GPIO_ACTIVE_HIGH>;
6363
dout-gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
64-
avdd-suppy = <&avdd>;
64+
avdd-supply = <&avdd>;
6565
clock-frequency = <100000>;
6666
};

Documentation/devicetree/bindings/mtd/allwinner,sun4i-a10-nand.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ patternProperties:
5555
"^pinctrl-[0-9]+$": true
5656

5757
"^nand@[a-f0-9]+$":
58+
type: object
5859
properties:
5960
reg:
6061
minimum: 0

Documentation/devicetree/bindings/mtd/nand-controller.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ properties:
4040

4141
patternProperties:
4242
"^nand@[a-f0-9]$":
43+
type: object
4344
properties:
4445
reg:
4546
description:

Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ description: |+
2222
2323
properties:
2424
compatible:
25-
enum: [ aspeed,ast2400-pinctrl, aspeed,g4-pinctrl ]
25+
enum:
26+
- aspeed,ast2400-pinctrl
27+
- aspeed,g4-pinctrl
2628

2729
patternProperties:
2830
'^.*$':

Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ description: |+
2222
2323
properties:
2424
compatible:
25-
enum: [ aspeed,ast2500-pinctrl, aspeed,g5-pinctrl ]
25+
enum:
26+
- aspeed,ast2500-pinctrl
27+
- aspeed,g5-pinctrl
2628
aspeed,external-nodes:
2729
minItems: 2
2830
maxItems: 2
@@ -74,9 +76,6 @@ required:
7476

7577
examples:
7678
- |
77-
compatible = "simple-bus";
78-
ranges;
79-
8079
apb {
8180
compatible = "simple-bus";
8281
#address-cells = <1>;
@@ -89,7 +88,7 @@ examples:
8988
9089
pinctrl: pinctrl {
9190
compatible = "aspeed,g5-pinctrl";
92-
aspeed,external-nodes = <&gfx &lhc>;
91+
aspeed,external-nodes = <&gfx>, <&lhc>;
9392
9493
pinctrl_i2c3_default: i2c3_default {
9594
function = "I2C3";

Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ properties:
5555

5656
patternProperties:
5757
'^gpio@[0-9a-f]*$':
58+
type: object
5859
properties:
5960
gpio-controller: true
6061
'#gpio-cells':
@@ -113,8 +114,10 @@ patternProperties:
113114
- st,bank-name
114115

115116
'-[0-9]*$':
117+
type: object
116118
patternProperties:
117119
'^pins':
120+
type: object
118121
description: |
119122
A pinctrl node should contain at least one subnode representing the
120123
pinctrl group available on the machine. Each subnode will list the
@@ -194,6 +197,7 @@ required:
194197
examples:
195198
- |
196199
#include <dt-bindings/pinctrl/stm32-pinfunc.h>
200+
#include <dt-bindings/mfd/stm32f4-rcc.h>
197201
//Example 1
198202
pinctrl@40020000 {
199203
#address-cells = <1>;
@@ -207,6 +211,7 @@ examples:
207211
#gpio-cells = <2>;
208212
reg = <0x0 0x400>;
209213
resets = <&reset_ahb1 0>;
214+
clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOA)>;
210215
st,bank-name = "GPIOA";
211216
};
212217
};
@@ -224,6 +229,7 @@ examples:
224229
#gpio-cells = <2>;
225230
reg = <0x1000 0x400>;
226231
resets = <&reset_ahb1 0>;
232+
clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOB)>;
227233
st,bank-name = "GPIOB";
228234
gpio-ranges = <&pinctrl 0 0 16>;
229235
};
@@ -233,6 +239,7 @@ examples:
233239
#gpio-cells = <2>;
234240
reg = <0x2000 0x400>;
235241
resets = <&reset_ahb1 0>;
242+
clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOC)>;
236243
st,bank-name = "GPIOC";
237244
ngpios = <5>;
238245
gpio-ranges = <&pinctrl 0 16 3>,

Documentation/devicetree/bindings/riscv/cpus.yaml

Lines changed: 61 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -10,97 +10,76 @@ maintainers:
1010
- Paul Walmsley <[email protected]>
1111
- Palmer Dabbelt <[email protected]>
1212

13-
allOf:
14-
- $ref: /schemas/cpus.yaml#
15-
1613
properties:
17-
$nodename:
18-
const: cpus
19-
description: Container of cpu nodes
20-
21-
'#address-cells':
22-
const: 1
23-
description: |
24-
A single unsigned 32-bit integer uniquely identifies each RISC-V
25-
hart in a system. (See the "reg" node under the "cpu" node,
26-
below).
27-
28-
'#size-cells':
29-
const: 0
14+
compatible:
15+
items:
16+
- enum:
17+
- sifive,rocket0
18+
- sifive,e5
19+
- sifive,e51
20+
- sifive,u54-mc
21+
- sifive,u54
22+
- sifive,u5
23+
- const: riscv
24+
description:
25+
Identifies that the hart uses the RISC-V instruction set
26+
and identifies the type of the hart.
27+
28+
mmu-type:
29+
allOf:
30+
- $ref: "/schemas/types.yaml#/definitions/string"
31+
- enum:
32+
- riscv,sv32
33+
- riscv,sv39
34+
- riscv,sv48
35+
description:
36+
Identifies the MMU address translation mode used on this
37+
hart. These values originate from the RISC-V Privileged
38+
Specification document, available from
39+
https://riscv.org/specifications/
40+
41+
riscv,isa:
42+
allOf:
43+
- $ref: "/schemas/types.yaml#/definitions/string"
44+
- enum:
45+
- rv64imac
46+
- rv64imafdc
47+
description:
48+
Identifies the specific RISC-V instruction set architecture
49+
supported by the hart. These are documented in the RISC-V
50+
User-Level ISA document, available from
51+
https://riscv.org/specifications/
52+
53+
timebase-frequency:
54+
type: integer
55+
minimum: 1
56+
description:
57+
Specifies the clock frequency of the system timer in Hz.
58+
This value is common to all harts on a single system image.
59+
60+
interrupt-controller:
61+
type: object
62+
description: Describes the CPU's local interrupt controller
3063

31-
patternProperties:
32-
'^cpu@[0-9a-f]+$':
3364
properties:
34-
compatible:
35-
type: array
36-
items:
37-
- enum:
38-
- sifive,rocket0
39-
- sifive,e5
40-
- sifive,e51
41-
- sifive,u54-mc
42-
- sifive,u54
43-
- sifive,u5
44-
- const: riscv
45-
description:
46-
Identifies that the hart uses the RISC-V instruction set
47-
and identifies the type of the hart.
48-
49-
mmu-type:
50-
allOf:
51-
- $ref: "/schemas/types.yaml#/definitions/string"
52-
- enum:
53-
- riscv,sv32
54-
- riscv,sv39
55-
- riscv,sv48
56-
description:
57-
Identifies the MMU address translation mode used on this
58-
hart. These values originate from the RISC-V Privileged
59-
Specification document, available from
60-
https://riscv.org/specifications/
61-
62-
riscv,isa:
63-
allOf:
64-
- $ref: "/schemas/types.yaml#/definitions/string"
65-
- enum:
66-
- rv64imac
67-
- rv64imafdc
68-
description:
69-
Identifies the specific RISC-V instruction set architecture
70-
supported by the hart. These are documented in the RISC-V
71-
User-Level ISA document, available from
72-
https://riscv.org/specifications/
65+
'#interrupt-cells':
66+
const: 1
7367

74-
timebase-frequency:
75-
type: integer
76-
minimum: 1
77-
description:
78-
Specifies the clock frequency of the system timer in Hz.
79-
This value is common to all harts on a single system image.
80-
81-
interrupt-controller:
82-
type: object
83-
description: Describes the CPU's local interrupt controller
84-
85-
properties:
86-
'#interrupt-cells':
87-
const: 1
88-
89-
compatible:
90-
const: riscv,cpu-intc
91-
92-
interrupt-controller: true
68+
compatible:
69+
const: riscv,cpu-intc
9370

94-
required:
95-
- '#interrupt-cells'
96-
- compatible
97-
- interrupt-controller
71+
interrupt-controller: true
9872

9973
required:
100-
- riscv,isa
101-
- timebase-frequency
74+
- '#interrupt-cells'
75+
- compatible
10276
- interrupt-controller
10377

78+
required:
79+
- riscv,isa
80+
- timebase-frequency
81+
- interrupt-controller
82+
10483
examples:
10584
- |
10685
// Example 1: SiFive Freedom U540G Development Kit

Documentation/devicetree/bindings/spi/allwinner,sun4i-a10-spi.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ properties:
5050

5151
patternProperties:
5252
"^.*@[0-9a-f]+":
53+
type: object
5354
properties:
5455
reg:
5556
items:

Documentation/devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ properties:
5555

5656
patternProperties:
5757
"^.*@[0-9a-f]+":
58+
type: object
5859
properties:
5960
reg:
6061
items:

0 commit comments

Comments
 (0)