Skip to content

Commit 531d264

Browse files
committed
Merge tag 'devicetree-for-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree updates from Rob Herring: "DT Bindings: - Various LED binding conversions and clean-ups. Convert the ir-spi-led, pwm-ir-tx, and gpio-ir-tx LED bindings to schemas. Consistently reference LED common.yaml or multi-led schemas and disallow undefined properties. - Convert IDT 89HPESx, pwm-clock, st,stmipid02, Xilinx PCIe hosts, and fsl,imx-fb bindings to schema - Add ata-generic, Broadcom u-boot environment, and dynamic MTD sub-partitions bindings. - Make all SPI based displays reference spi-peripheral-props.yaml - Fix some schema property regex's which should be fixed strings or were missing start/end anchors - Remove 'status' in examples, again... DT Core: - Fix a possible NULL dereference in overlay functions - Fix kexec reading 32-bit "linux,initrd-{start,end}" values (which never worked) - Add of_address_count() helper to count number of 'reg' entries - Support .dtso extension for DT overlay source files. Rename staging and unittest overlay files. - Update dtc to upstream v1.6.1-63-g55778a03df61" * tag 'devicetree-for-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (42 commits) dt-bindings: leds: Add missing references to common LED schema dt-bindings: leds: intel,lgm: Add missing 'led-gpios' property of: overlay: fix null pointer dereferencing in find_dup_cset_node_entry() and find_dup_cset_prop() dt-bindings: lcdif: Fix constraints for imx8mp media: dt-bindings: atmel,isc: Drop unneeded unevaluatedProperties dt-bindings: Drop Jee Heng Sia dt-bindings: thermal: cooling-devices: Add missing cache related properties dt-bindings: leds: irled: ir-spi-led: convert to DT schema dt-bindings: leds: irled: pwm-ir-tx: convert to DT schema dt-bindings: leds: irled: gpio-ir-tx: convert to DT schema dt-bindings: leds: mt6360: rework to match multi-led dt-bindings: leds: lp55xx: rework to match multi-led dt-bindings: leds: lp55xx: switch to preferred 'gpios' suffix dt-bindings: leds: lp55xx: allow label dt-bindings: leds: use unevaluatedProperties for common.yaml dt-bindings: thermal: tsens: Add SM6115 compatible of/kexec: Fix reading 32-bit "linux,initrd-{start,end}" values dt-bindings: display: Convert fsl,imx-fb.txt to dt-schema dt-bindings: Add missing start and/or end of line regex anchors dt-bindings: qcom,pdc: Add missing compatibles ...
2 parents 4d03390 + 580f989 commit 531d264

File tree

98 files changed

+1362
-724
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+1362
-724
lines changed

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra-ccplex-cluster.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,4 @@ examples:
4747
compatible = "nvidia,tegra234-ccplex-cluster";
4848
reg = <0x0e000000 0x5ffff>;
4949
nvidia,bpmp = <&bpmp>;
50-
status = "okay";
5150
};

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.yaml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,33 @@ properties:
123123
some PLLs, clocks and then brings up CPU0 for resuming the
124124
system.
125125

126+
core-supply:
127+
description:
128+
Phandle to voltage regulator connected to the SoC Core power rail.
129+
130+
core-domain:
131+
type: object
132+
description: |
133+
The vast majority of hardware blocks of Tegra SoC belong to a
134+
Core power domain, which has a dedicated voltage rail that powers
135+
the blocks.
136+
137+
properties:
138+
operating-points-v2:
139+
description:
140+
Should contain level, voltages and opp-supported-hw property.
141+
The supported-hw is a bitfield indicating SoC speedo or process
142+
ID mask.
143+
144+
"#power-domain-cells":
145+
const: 0
146+
147+
required:
148+
- operating-points-v2
149+
- "#power-domain-cells"
150+
151+
additionalProperties: false
152+
126153
i2c-thermtrip:
127154
type: object
128155
description:
@@ -300,33 +327,6 @@ patternProperties:
300327

301328
additionalProperties: false
302329

303-
core-domain:
304-
type: object
305-
description: |
306-
The vast majority of hardware blocks of Tegra SoC belong to a
307-
Core power domain, which has a dedicated voltage rail that powers
308-
the blocks.
309-
310-
properties:
311-
operating-points-v2:
312-
description:
313-
Should contain level, voltages and opp-supported-hw property.
314-
The supported-hw is a bitfield indicating SoC speedo or process
315-
ID mask.
316-
317-
"#power-domain-cells":
318-
const: 0
319-
320-
required:
321-
- operating-points-v2
322-
- "#power-domain-cells"
323-
324-
additionalProperties: false
325-
326-
core-supply:
327-
description:
328-
Phandle to voltage regulator connected to the SoC Core power rail.
329-
330330
required:
331331
- compatible
332332
- reg
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/ata/ata-generic.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Generic Parallel ATA Controller
8+
9+
maintainers:
10+
- Linus Walleij <[email protected]>
11+
12+
description:
13+
Generic Parallel ATA controllers supporting PIO modes only.
14+
15+
properties:
16+
compatible:
17+
items:
18+
- enum:
19+
- arm,vexpress-cf
20+
- fsl,mpc8349emitx-pata
21+
- const: ata-generic
22+
23+
reg:
24+
items:
25+
- description: Command interface registers
26+
- description: Control interface registers
27+
28+
reg-shift:
29+
enum: [ 1, 2 ]
30+
31+
interrupts:
32+
maxItems: 1
33+
34+
ata-generic,use16bit:
35+
type: boolean
36+
description: Use 16-bit accesses instead of 32-bit for data transfers
37+
38+
pio-mode:
39+
description: Maximum ATA PIO transfer mode
40+
$ref: /schemas/types.yaml#/definitions/uint32
41+
maximum: 6
42+
default: 0
43+
44+
required:
45+
- compatible
46+
- reg
47+
48+
additionalProperties: false
49+
50+
examples:
51+
- |
52+
compact-flash@1a000 {
53+
compatible = "arm,vexpress-cf", "ata-generic";
54+
reg = <0x1a000 0x100>,
55+
<0x1a100 0xf00>;
56+
reg-shift = <2>;
57+
};
58+
...

Documentation/devicetree/bindings/clock/pwm-clock.txt

Lines changed: 0 additions & 26 deletions
This file was deleted.
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/pwm-clock.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: An external clock signal driven by a PWM pin.
8+
9+
maintainers:
10+
- Philipp Zabel <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: pwm-clock
15+
16+
'#clock-cells':
17+
const: 0
18+
19+
clock-frequency:
20+
description: Exact output frequency, in case the PWM period is not exact
21+
but was rounded to nanoseconds.
22+
23+
clock-output-names:
24+
maxItems: 1
25+
26+
pwms:
27+
maxItems: 1
28+
29+
required:
30+
- compatible
31+
- '#clock-cells'
32+
- pwms
33+
34+
additionalProperties: false
35+
36+
examples:
37+
- |
38+
clock {
39+
compatible = "pwm-clock";
40+
#clock-cells = <0>;
41+
clock-frequency = <25000000>;
42+
clock-output-names = "mipi_mclk";
43+
pwms = <&pwm2 0 40>; /* 1 / 40 ns = 25 MHz */
44+
};
45+
...

Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ properties:
3838
type: object
3939

4040
patternProperties:
41-
'cpu@[0-9a-f]+':
41+
'^cpu@[0-9a-f]+$':
4242
type: object
4343

4444
properties:

Documentation/devicetree/bindings/display/fsl,lcdif.yaml

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ properties:
5252
interrupts:
5353
maxItems: 1
5454

55+
power-domains:
56+
maxItems: 1
57+
5558
port:
5659
$ref: /schemas/graph.yaml#/properties/port
5760
description: The LCDIF output port
@@ -81,7 +84,31 @@ allOf:
8184
maxItems: 3
8285
required:
8386
- clock-names
84-
else:
87+
- if:
88+
properties:
89+
compatible:
90+
contains:
91+
const: fsl,imx8mp-lcdif
92+
then:
93+
properties:
94+
clocks:
95+
minItems: 3
96+
maxItems: 3
97+
clock-names:
98+
minItems: 3
99+
maxItems: 3
100+
required:
101+
- clock-names
102+
- power-domains
103+
- if:
104+
not:
105+
properties:
106+
compatible:
107+
contains:
108+
enum:
109+
- fsl,imx6sx-lcdif
110+
- fsl,imx8mp-lcdif
111+
then:
85112
properties:
86113
clocks:
87114
maxItems: 1

Documentation/devicetree/bindings/display/imx/fsl,imx-fb.txt

Lines changed: 0 additions & 57 deletions
This file was deleted.

0 commit comments

Comments
 (0)