Skip to content

Commit 8395d93

Browse files
committed
Merge tag 'devicetree-for-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree updates from Rob Herring: "DT core: - Add node lifecycle unit tests - Add of_property_present() helper aligned with fwnode API - Print more information on reserved regions on boot - Update dtc to upstream v1.6.1-66-gabbd523bae6e - Use strscpy() to instead of strncpy() in DT core - Add option for schema validation on %.dtb targets Bindings: - Add/fix support for listing multiple patterns in DT_SCHEMA_FILES - Rework external memory controller/bus bindings to properly support controller specific child node properties - Convert loongson,ls1x-intc, fcs,fusb302, sil,sii8620, Rockchip RK3399 PCIe, Synquacer I2C, and Synquacer EXIU bindings to DT schema format - Add RiscV SBI PMU event mapping binding - Add missing contraints on Arm SCMI child node allowed properties - Add a bunch of missing Socionext UniPhier glue block bindings and example fixes - Various fixes for duplicate or conflicting type definitions on DT properties" * tag 'devicetree-for-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (66 commits) dt-bindings: regulator: Add mps,mpq7932 power-management IC of: dynamic: Fix spelling mistake "kojbect" -> "kobject" dt-bindings: drop Sagar Kadam from SiFive binding maintainership dt-bindings: sram: qcom,imem: document sm8450 dt-bindings: interrupt-controller: convert loongson,ls1x-intc.txt to json-schema dt-bindings: arm: Add Cortex-A715 and X3 of: dynamic: add lifecycle docbook info to node creation functions of: add consistency check to of_node_release() of: do not use "%pOF" printk format on node with refcount of zero of: unittest: add node lifecycle tests of: update kconfig unittest help of: add processing of EXPECT_NOT to of_unittest_expect of: prepare to add processing of EXPECT_NOT to of_unittest_expect of: Use preferred of_property_read_* functions of: Use of_property_present() helper of: Add of_property_present() helper of: reserved_mem: Use proper binary prefix dt-bindings: Fix multi pattern support in DT_SCHEMA_FILES of: reserved-mem: print out reserved-mem details during boot dt-bindings: serial: restrict possible child node names ...
2 parents a93e884 + 1ba7dfb commit 8395d93

File tree

102 files changed

+2336
-825
lines changed

Some content is hidden

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

102 files changed

+2336
-825
lines changed

Documentation/devicetree/bindings/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ $(obj)/%.example.dts: $(src)/%.yaml check_dtschema_version FORCE
2828
find_all_cmd = find $(srctree)/$(src) \( -name '*.yaml' ! \
2929
-name 'processed-schema*' \)
3030

31-
find_cmd = $(find_all_cmd) | grep -F "$(DT_SCHEMA_FILES)"
31+
find_cmd = $(find_all_cmd) | grep -F -e "$(subst :," -e ",$(DT_SCHEMA_FILES))"
3232
CHK_DT_DOCS := $(shell $(find_cmd))
3333

3434
quiet_cmd_yamllint = LINT $(src)

Documentation/devicetree/bindings/arm/cpus.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ properties:
141141
- arm,cortex-a78ae
142142
- arm,cortex-a510
143143
- arm,cortex-a710
144+
- arm,cortex-a715
144145
- arm,cortex-m0
145146
- arm,cortex-m0+
146147
- arm,cortex-m1
@@ -151,6 +152,7 @@ properties:
151152
- arm,cortex-r7
152153
- arm,cortex-x1
153154
- arm,cortex-x2
155+
- arm,cortex-x3
154156
- arm,neoverse-e1
155157
- arm,neoverse-n1
156158
- arm,neoverse-n2

Documentation/devicetree/bindings/ata/intel,ixp4xx-compact-flash.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ required:
3535

3636
allOf:
3737
- $ref: pata-common.yaml#
38+
- $ref: /schemas/memory-controllers/intel,ixp4xx-expansion-peripheral-props.yaml#
3839

3940
unevaluatedProperties: false
4041

Documentation/devicetree/bindings/clock/qcom,videocc.yaml

Lines changed: 55 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ properties:
3030
- qcom,sm8250-videocc
3131

3232
clocks:
33-
items:
34-
- description: Board XO source
33+
minItems: 1
34+
maxItems: 3
3535

3636
clock-names:
37-
items:
38-
- const: bi_tcxo
37+
minItems: 1
38+
maxItems: 3
3939

4040
'#clock-cells':
4141
const: 1
@@ -68,6 +68,57 @@ required:
6868
- '#reset-cells'
6969
- '#power-domain-cells'
7070

71+
allOf:
72+
- if:
73+
properties:
74+
compatible:
75+
enum:
76+
- qcom,sc7180-videocc
77+
- qcom,sdm845-videocc
78+
- qcom,sm8150-videocc
79+
then:
80+
properties:
81+
clocks:
82+
items:
83+
- description: Board XO source
84+
clock-names:
85+
items:
86+
- const: bi_tcxo
87+
88+
- if:
89+
properties:
90+
compatible:
91+
enum:
92+
- qcom,sc7280-videocc
93+
then:
94+
properties:
95+
clocks:
96+
items:
97+
- description: Board XO source
98+
- description: Board active XO source
99+
clock-names:
100+
items:
101+
- const: bi_tcxo
102+
- const: bi_tcxo_ao
103+
104+
- if:
105+
properties:
106+
compatible:
107+
enum:
108+
- qcom,sm8250-videocc
109+
then:
110+
properties:
111+
clocks:
112+
items:
113+
- description: AHB
114+
- description: Board XO source
115+
- description: Board active XO source
116+
clock-names:
117+
items:
118+
- const: iface
119+
- const: bi_tcxo
120+
- const: bi_tcxo_ao
121+
71122
additionalProperties: false
72123

73124
examples:

Documentation/devicetree/bindings/clock/sifive/fu540-prci.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
88
title: SiFive FU540 Power Reset Clock Interrupt Controller (PRCI)
99

1010
maintainers:
11-
- Sagar Kadam <[email protected]>
1211
- Paul Walmsley <[email protected]>
1312

1413
description:

Documentation/devicetree/bindings/clock/socionext,uniphier-clock.yaml

Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -61,40 +61,7 @@ required:
6161

6262
examples:
6363
- |
64-
sysctrl@61840000 {
65-
compatible = "socionext,uniphier-sysctrl", "simple-mfd", "syscon";
66-
reg = <0x61840000 0x4000>;
67-
68-
clock {
69-
compatible = "socionext,uniphier-ld11-clock";
70-
#clock-cells = <1>;
71-
};
72-
73-
// other nodes ...
74-
};
75-
76-
- |
77-
mioctrl@59810000 {
78-
compatible = "socionext,uniphier-mioctrl", "simple-mfd", "syscon";
79-
reg = <0x59810000 0x800>;
80-
81-
clock {
82-
compatible = "socionext,uniphier-ld11-mio-clock";
83-
#clock-cells = <1>;
84-
};
85-
86-
// other nodes ...
87-
};
88-
89-
- |
90-
perictrl@59820000 {
91-
compatible = "socionext,uniphier-perictrl", "simple-mfd", "syscon";
92-
reg = <0x59820000 0x200>;
93-
94-
clock {
95-
compatible = "socionext,uniphier-ld11-peri-clock";
96-
#clock-cells = <1>;
97-
};
98-
99-
// other nodes ...
64+
clock-controller {
65+
compatible = "socionext,uniphier-ld11-clock";
66+
#clock-cells = <1>;
10067
};
Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/bridge/sil,sii8620.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Silicon Image SiI8620 HDMI/MHL bridge
8+
9+
maintainers:
10+
- Krzysztof Kozlowski <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: sil,sii8620
15+
16+
reg:
17+
maxItems: 1
18+
19+
clocks:
20+
maxItems: 1
21+
22+
clock-names:
23+
items:
24+
- const: xtal
25+
26+
cvcc10-supply:
27+
description: Digital Core Supply Voltage (1.0V)
28+
29+
interrupts:
30+
maxItems: 1
31+
32+
iovcc18-supply:
33+
description: I/O Supply Voltage (1.8V)
34+
35+
reset-gpios:
36+
maxItems: 1
37+
38+
ports:
39+
$ref: /schemas/graph.yaml#/properties/ports
40+
unevaluatedProperties: false
41+
42+
properties:
43+
port@0:
44+
$ref: /schemas/graph.yaml#/properties/port
45+
description:
46+
Video port for HDMI (encoder) input
47+
48+
port@1:
49+
$ref: /schemas/graph.yaml#/properties/port
50+
description:
51+
MHL to connector port
52+
53+
required:
54+
- port@0
55+
- port@1
56+
57+
required:
58+
- compatible
59+
- reg
60+
- clocks
61+
- cvcc10-supply
62+
- interrupts
63+
- iovcc18-supply
64+
- reset-gpios
65+
- ports
66+
67+
additionalProperties: false
68+
69+
examples:
70+
- |
71+
#include <dt-bindings/gpio/gpio.h>
72+
#include <dt-bindings/interrupt-controller/irq.h>
73+
74+
i2c {
75+
#address-cells = <1>;
76+
#size-cells = <0>;
77+
78+
bridge@39 {
79+
reg = <0x39>;
80+
compatible = "sil,sii8620";
81+
cvcc10-supply = <&ldo36_reg>;
82+
iovcc18-supply = <&ldo34_reg>;
83+
interrupt-parent = <&gpf0>;
84+
interrupts = <2 IRQ_TYPE_LEVEL_HIGH>;
85+
reset-gpios = <&gpv7 0 GPIO_ACTIVE_LOW>;
86+
clocks = <&pmu_system_controller 0>;
87+
clock-names = "xtal";
88+
89+
ports {
90+
#address-cells = <1>;
91+
#size-cells = <0>;
92+
93+
port@0 {
94+
reg = <0>;
95+
mhl_to_hdmi: endpoint {
96+
remote-endpoint = <&hdmi_to_mhl>;
97+
};
98+
};
99+
100+
port@1 {
101+
reg = <1>;
102+
mhl_to_musb_con: endpoint {
103+
remote-endpoint = <&musb_con_to_mhl>;
104+
};
105+
};
106+
};
107+
};
108+
};

Documentation/devicetree/bindings/display/bridge/sil-sii8620.txt

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

Documentation/devicetree/bindings/display/msm/dp-controller.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ properties:
7171
items:
7272
- const: dp
7373

74-
operating-points-v2:
75-
maxItems: 1
74+
operating-points-v2: true
7675

7776
opp-table: true
7877

Documentation/devicetree/bindings/display/msm/gpu.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ properties:
8989
help bring the GPU out of secure mode.
9090
properties:
9191
memory-region:
92-
$ref: /schemas/types.yaml#/definitions/phandle
92+
maxItems: 1
9393

9494
firmware-name:
9595
description: |

0 commit comments

Comments
 (0)