Skip to content

Commit e6de688

Browse files
committed
Merge tag 'devicetree-for-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree updates from Rob Herring: "Bindings: - Enable dtc "interrupt_provider" warnings for binding examples. Fix the warnings in fsl,mu-msi and ti,sci-inta due to this. - Convert zii,rave-sp-wdt, zii,rave-sp-pwrbutton, and altr,fpga-passive-serial to DT schema format - Add some documentation on the different forms of YAML text blocks which are a constant source of review comments - Fix some schema errors in constraints for arrays - Add compatibles for qcom,sar2130p-pdc and onnn,adt7462 DT core: - Allow overlay kunit tests to run CONFIG_OF_OVERLAY=n - Add some warnings on deprecated address handling - Rework early_init_dt_scan() so the arch can pass in the phys address of the DTB as __pa() is not always valid to use. This fixes a warning for arm64 with kexec. - Add and use some new DT graph iterators for iterating over ports and endpoints - Rework reserved-memory handling to be sized dynamically for fixed regions - Optimize of_modalias() to avoid a strlen() call - Constify struct device_node and property pointers where ever possible" * tag 'devicetree-for-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (36 commits) of: Allow overlay kunit tests to run CONFIG_OF_OVERLAY=n dt-bindings: interrupt-controller: qcom,pdc: Add SAR2130P compatible of/address: Rework bus matching to avoid warnings of: WARN on deprecated #address-cells/#size-cells handling of/fdt: Don't use default address cell sizes for address translation dt-bindings: Enable dtc "interrupt_provider" warnings of/fdt: add dt_phys arg to early_init_dt_scan and early_init_dt_verify dt-bindings: cache: qcom,llcc: Fix X1E80100 reg entries dt-bindings: watchdog: convert zii,rave-sp-wdt.txt to yaml format dt-bindings: input: convert zii,rave-sp-pwrbutton.txt to yaml media: xilinx-tpg: use new of_graph functions fbdev: omapfb: use new of_graph functions gpu: drm: omapdrm: use new of_graph functions ASoC: audio-graph-card2: use new of_graph functions ASoC: audio-graph-card: use new of_graph functions ASoC: test-component: use new of_graph functions of: property: use new of_graph functions of: property: add of_graph_get_next_port_endpoint() of: property: add of_graph_get_next_port() of: module: remove strlen() call in of_modalias() ...
2 parents 80db457 + 28b513b commit e6de688

78 files changed

Lines changed: 786 additions & 483 deletions

Some content is hidden

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

Documentation/devicetree/bindings/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ DT_DOCS = $(patsubst $(srctree)/%,%,$(shell $(find_all_cmd)))
5656
override DTC_FLAGS := \
5757
-Wno-avoid_unnecessary_addr_size \
5858
-Wno-graph_child_address \
59-
-Wno-interrupt_provider \
6059
-Wno-unique_unit_address \
6160
-Wunique_unit_address_if_enabled
6261

Documentation/devicetree/bindings/cache/l2c2x0.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,8 @@ properties:
100100
filter. Addresses in the filter window are directed to the M1 port. Other
101101
addresses will go to the M0 port.
102102
$ref: /schemas/types.yaml#/definitions/uint32-array
103-
items:
104-
minItems: 2
105-
maxItems: 2
103+
minItems: 2
104+
maxItems: 2
106105

107106
arm,io-coherent:
108107
description: indicates that the system is operating in an hardware

Documentation/devicetree/bindings/cache/qcom,llcc.yaml

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ properties:
3939

4040
reg:
4141
minItems: 2
42-
maxItems: 9
42+
maxItems: 10
4343

4444
reg-names:
4545
minItems: 2
46-
maxItems: 9
46+
maxItems: 10
4747

4848
interrupts:
4949
maxItems: 1
@@ -134,6 +134,36 @@ allOf:
134134
- qcom,qdu1000-llcc
135135
- qcom,sc8180x-llcc
136136
- qcom,sc8280xp-llcc
137+
then:
138+
properties:
139+
reg:
140+
items:
141+
- description: LLCC0 base register region
142+
- description: LLCC1 base register region
143+
- description: LLCC2 base register region
144+
- description: LLCC3 base register region
145+
- description: LLCC4 base register region
146+
- description: LLCC5 base register region
147+
- description: LLCC6 base register region
148+
- description: LLCC7 base register region
149+
- description: LLCC broadcast base register region
150+
reg-names:
151+
items:
152+
- const: llcc0_base
153+
- const: llcc1_base
154+
- const: llcc2_base
155+
- const: llcc3_base
156+
- const: llcc4_base
157+
- const: llcc5_base
158+
- const: llcc6_base
159+
- const: llcc7_base
160+
- const: llcc_broadcast_base
161+
162+
- if:
163+
properties:
164+
compatible:
165+
contains:
166+
enum:
137167
- qcom,x1e80100-llcc
138168
then:
139169
properties:
@@ -148,6 +178,7 @@ allOf:
148178
- description: LLCC6 base register region
149179
- description: LLCC7 base register region
150180
- description: LLCC broadcast base register region
181+
- description: LLCC broadcast AND register region
151182
reg-names:
152183
items:
153184
- const: llcc0_base
@@ -159,6 +190,7 @@ allOf:
159190
- const: llcc6_base
160191
- const: llcc7_base
161192
- const: llcc_broadcast_base
193+
- const: llcc_broadcast_and_base
162194

163195
- if:
164196
properties:

Documentation/devicetree/bindings/dma/dma-common.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,9 @@ properties:
3232
The first item in the array is for channels 0-31, the second is for
3333
channels 32-63, etc.
3434
$ref: /schemas/types.yaml#/definitions/uint32-array
35-
items:
36-
minItems: 1
37-
# Should be enough
38-
maxItems: 255
35+
minItems: 1
36+
# Should be enough
37+
maxItems: 255
3938

4039
dma-channels:
4140
$ref: /schemas/types.yaml#/definitions/uint32

Documentation/devicetree/bindings/example-schema.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,4 +262,5 @@ examples:
262262
reg-names = "core", "aux";
263263
interrupts = <10>;
264264
interrupt-controller;
265+
#interrupt-cells = <2>;
265266
};

Documentation/devicetree/bindings/fpga/altera-passive-serial.txt

Lines changed: 0 additions & 29 deletions
This file was deleted.
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/fpga/altr,fpga-passive-serial.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Altera Passive Serial SPI FPGA Manager
8+
9+
maintainers:
10+
- Fabio Estevam <festevam@denx.de>
11+
12+
description: |
13+
Altera FPGAs support a method of loading the bitstream over what is
14+
referred to as "passive serial".
15+
The passive serial link is not technically SPI, and might require extra
16+
circuits in order to play nicely with other SPI slaves on the same bus.
17+
18+
See https://www.altera.com/literature/hb/cyc/cyc_c51013.pdf
19+
20+
allOf:
21+
- $ref: /schemas/spi/spi-peripheral-props.yaml#
22+
23+
properties:
24+
compatible:
25+
enum:
26+
- altr,fpga-passive-serial
27+
- altr,fpga-arria10-passive-serial
28+
29+
spi-max-frequency:
30+
maximum: 20000000
31+
32+
reg:
33+
maxItems: 1
34+
35+
nconfig-gpios:
36+
description:
37+
Config pin (referred to as nCONFIG in the manual).
38+
maxItems: 1
39+
40+
nstat-gpios:
41+
description:
42+
Status pin (referred to as nSTATUS in the manual).
43+
maxItems: 1
44+
45+
confd-gpios:
46+
description:
47+
confd pin (referred to as CONF_DONE in the manual)
48+
maxItems: 1
49+
50+
required:
51+
- compatible
52+
- reg
53+
- nconfig-gpios
54+
- nstat-gpios
55+
56+
additionalProperties: false
57+
58+
examples:
59+
- |
60+
#include <dt-bindings/gpio/gpio.h>
61+
62+
spi {
63+
#address-cells = <1>;
64+
#size-cells = <0>;
65+
66+
fpga@0 {
67+
compatible = "altr,fpga-passive-serial";
68+
reg = <0>;
69+
nconfig-gpios = <&gpio4 18 GPIO_ACTIVE_LOW>;
70+
nstat-gpios = <&gpio4 19 GPIO_ACTIVE_LOW>;
71+
confd-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
72+
};
73+
};
74+
...

Documentation/devicetree/bindings/input/zii,rave-sp-pwrbutton.txt

Lines changed: 0 additions & 22 deletions
This file was deleted.
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/input/zii,rave-sp-pwrbutton.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Zodiac Inflight Innovations RAVE Supervisory Processor Power Button
8+
9+
maintainers:
10+
- Frank Li <Frank.li@nxp.com>
11+
12+
description:
13+
RAVE SP input device is a "MFD cell" device corresponding to power
14+
button functionality of RAVE Supervisory Processor. It is expected
15+
that its Device Tree node is specified as a child of the node
16+
corresponding to the parent RAVE SP device (as documented in
17+
Documentation/devicetree/bindings/mfd/zii,rave-sp.yaml)
18+
19+
properties:
20+
compatible:
21+
const: zii,rave-sp-pwrbutton
22+
23+
required:
24+
- compatible
25+
26+
allOf:
27+
- $ref: input.yaml
28+
29+
unevaluatedProperties: false
30+
31+
examples:
32+
- |
33+
pwrbutton {
34+
compatible = "zii,rave-sp-pwrbutton";
35+
};
36+

Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.yaml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,9 @@ properties:
132132
Address property. Base address of an alias of the GICD region containing
133133
only the {SET,CLR}SPI registers to be used if isolation is required,
134134
and if supported by the HW.
135-
$ref: /schemas/types.yaml#/definitions/uint32-array
136-
items:
137-
minItems: 1
138-
maxItems: 2
135+
oneOf:
136+
- $ref: /schemas/types.yaml#/definitions/uint32
137+
- $ref: /schemas/types.yaml#/definitions/uint64
139138

140139
ppi-partitions:
141140
type: object
@@ -223,9 +222,8 @@ patternProperties:
223222
(u32, u32) tuple describing the untranslated
224223
address and size of the pre-ITS window.
225224
$ref: /schemas/types.yaml#/definitions/uint32-array
226-
items:
227-
minItems: 2
228-
maxItems: 2
225+
minItems: 2
226+
maxItems: 2
229227

230228
required:
231229
- compatible

0 commit comments

Comments
 (0)