Skip to content

Commit 098b6e4

Browse files
committed
Merge tag 'devicetree-for-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree updates from Rob Herring: "DT core: - Sync dtc/libfdt with upstream v1.7.2-62-ga26ef6400bd8 - Add a for_each_compatible_node_scoped() loop and convert users in cpufreq, dmaengine, clk, cdx, powerpc and Arm - Simplify of/platform.c with scoped loop helpers - Add fw_devlink tracking for "mmc-pwrseq" - Optimize fw_devlink callback code size for pinctrl-N properties - Replace strcmp_suffix() with strends() DT bindings: - Support building single binding targets - Convert google,goldfish-fb, cznic,turris-mox-rwtm, ti,prm-inst - Add bindings for Freescale AVIC, Realtek RTD1xxx system controllers, Microchip 25AA010A EEPROM, OnSemi FIN3385, IEI WT61P803 PUZZLE, Delta Electronics DPS-800-AB power supply, Infineon IR35221 Digital Multi-phase Controller, Infineon PXE1610 Digital Dual Output 6+1 VR12.5 & VR13 CPU Controller, socionext,uniphier-smpctrl, and xlnx,zynqmp-firmware - Lots of trivial binding fixes to address warnings in DTS files. These are mostly for arm64 platforms which is getting closer to be warning free. Some public shaming has helped. - Fix I2C bus node names in examples - Drop obsolete brcm,vulcan-soc binding - Drop unreferenced binding headers" * tag 'devicetree-for-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (60 commits) dt-bindings: interrupt-controller: Add compatiblie string fsl,imx(1|25|27|31|35)-avic dt-bindings: soc: imx: add fsl,aips and fsl,emi compatible strings dt-bindings: display: bridge: lt8912b: Drop reset gpio requirement dt-bindings: firmware: fsl,scu: Mark multi-channel MU layouts as deprecated cpufreq: s5pv210: Simplify with scoped for each OF child loop dmaengine: fsl_raid: Simplify with scoped for each OF child loop clk: imx: imx31: Simplify with scoped for each OF child loop clk: imx: imx27: Simplify with scoped for each OF child loop cdx: Use mutex guard to simplify error handling cdx: Simplify with scoped for each OF child loop powerpc/wii: Simplify with scoped for each OF child loop powerpc/fsp2: Simplify with scoped for each OF child loop ARM: exynos: Simplify with scoped for each OF child loop ARM: at91: Simplify with scoped for each OF child loop of: Add for_each_compatible_node_scoped() helper dt-bindings: Fix emails with spaces or missing brackets scripts/dtc: Update to upstream version v1.7.2-62-ga26ef6400bd8 dt-bindings: crypto: inside-secure,safexcel: Mandate only ring IRQs dt-bindings: crypto: inside-secure,safexcel: Add SoC compatibles of: reserved_mem: Fix placement of __free() annotation ...
2 parents c6e62d0 + a16f91f commit 098b6e4

97 files changed

Lines changed: 1254 additions & 1837 deletions

File tree

Some content is hidden

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

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ ForEachMacros:
259259
- 'for_each_collection'
260260
- 'for_each_comp_order'
261261
- 'for_each_compatible_node'
262+
- 'for_each_compatible_node_scoped'
262263
- 'for_each_component_dais'
263264
- 'for_each_component_dais_safe'
264265
- 'for_each_conduit'

Documentation/devicetree/bindings/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ DT_DOCS = $(patsubst $(srctree)/%,%,$(shell $(find_all_cmd)))
5656

5757
override DTC_FLAGS := \
5858
-Wno-avoid_unnecessary_addr_size \
59-
-Wno-graph_child_address \
6059
-Wno-unique_unit_address \
6160
-Wunique_unit_address_if_enabled
6261

@@ -82,5 +81,8 @@ clean-files = $(shell find $(obj) \( -name '*.example.dts' -o \
8281
dt_compatible_check: $(obj)/processed-schema.json
8382
$(Q)$(srctree)/scripts/dtc/dt-extract-compatibles $(srctree) | xargs dt-check-compatible -v -s $<
8483

84+
PHONY += dt_binding_check_one
85+
dt_binding_check_one: $(obj)/.dt-binding.checked $(obj)/.yamllint.checked
86+
8587
PHONY += dt_binding_check
86-
dt_binding_check: $(obj)/.dt-binding.checked $(obj)/.yamllint.checked $(CHK_DT_EXAMPLES)
88+
dt_binding_check: dt_binding_check_one $(CHK_DT_EXAMPLES)

Documentation/devicetree/bindings/arm/arm,vexpress-juno.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,12 @@ patternProperties:
157157
- const: simple-bus
158158
- const: simple-bus
159159

160+
"#interrupt-cells":
161+
const: 1
162+
163+
interrupt-map: true
164+
interrupt-map-mask: true
165+
160166
patternProperties:
161167
'^motherboard-bus@':
162168
type: object

Documentation/devicetree/bindings/arm/bcm/brcm,vulcan-soc.yaml

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

Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@ properties:
6565
gpio-line-names:
6666
minItems: 8
6767

68+
patternProperties:
69+
'-hog$':
70+
required:
71+
- gpio-hog
72+
6873
required:
6974
- compatible
7075
- gpio-controller
@@ -87,6 +92,9 @@ properties:
8792
- compatible
8893
- "#reset-cells"
8994

95+
power:
96+
$ref: /schemas/power/raspberrypi,bcm2835-power.yaml#
97+
9098
pwm:
9199
type: object
92100
additionalProperties: false

Documentation/devicetree/bindings/arm/omap/prm-inst.txt

Lines changed: 0 additions & 31 deletions
This file was deleted.
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/arm/ti/ti,omap-prm-inst.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: OMAP PRM instances
8+
9+
maintainers:
10+
- Aaro Koskinen <aaro.koskinen@iki.fi>
11+
- Andreas Kemnade <andreas@kemnade.info>
12+
- Kevin Hilman <khilman@baylibre.com>
13+
- Roger Quadros <rogerq@kernel.org>
14+
- Tony Lindgren <tony@atomide.com>
15+
16+
description:
17+
Power and Reset Manager is an IP block on OMAP family of devices which
18+
handle the power domains and their current state, and provide reset
19+
handling for the domains and/or separate IP blocks under the power domain
20+
hierarchy.
21+
22+
properties:
23+
compatible:
24+
items:
25+
- enum:
26+
- ti,am3-prm-inst
27+
- ti,am4-prm-inst
28+
- ti,omap4-prm-inst
29+
- ti,omap5-prm-inst
30+
- ti,dra7-prm-inst
31+
- const: ti,omap-prm-inst
32+
33+
reg:
34+
maxItems: 1
35+
36+
"#power-domain-cells":
37+
const: 0
38+
39+
"#reset-cells":
40+
const: 1
41+
42+
required:
43+
- compatible
44+
- reg
45+
46+
additionalProperties: false
47+
48+
examples:
49+
- |
50+
reset-controller@1b00 {
51+
compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
52+
reg = <0x1b00 0x40>;
53+
#power-domain-cells = <0>;
54+
#reset-cells = <1>;
55+
};

Documentation/devicetree/bindings/arm/vexpress-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ required:
103103
- arm,vexpress,config-bridge
104104

105105
patternProperties:
106-
'clk[0-9]*$':
106+
'^clock-controller.*$':
107107
type: object
108108
description:
109109
clocks
@@ -137,7 +137,7 @@ patternProperties:
137137
- arm,vexpress-sysreg,func
138138
- "#clock-cells"
139139

140-
"^volt-.+$":
140+
"^regulator-.+$":
141141
$ref: /schemas/regulator/regulator.yaml#
142142
properties:
143143
compatible:
@@ -272,7 +272,7 @@ examples:
272272
compatible = "arm,vexpress,config-bus";
273273
arm,vexpress,config-bridge = <&v2m_sysreg>;
274274
275-
clk0 {
275+
clock-controller {
276276
compatible = "arm,vexpress-osc";
277277
arm,vexpress-sysreg,func = <1 0>;
278278
#clock-cells = <0>;

Documentation/devicetree/bindings/bus/aspeed,ast2600-ahbc.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ description: |
1717
1818
properties:
1919
compatible:
20-
enum:
21-
- aspeed,ast2600-ahbc
20+
items:
21+
- enum:
22+
- aspeed,ast2600-ahbc
23+
- const: syscon
2224

2325
reg:
2426
maxItems: 1
@@ -32,6 +34,6 @@ additionalProperties: false
3234
examples:
3335
- |
3436
ahbc@1e600000 {
35-
compatible = "aspeed,ast2600-ahbc";
37+
compatible = "aspeed,ast2600-ahbc", "syscon";
3638
reg = <0x1e600000 0x100>;
3739
};

Documentation/devicetree/bindings/bus/fsl,spba-bus.yaml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,29 @@ description: |
1919
the SDMA can access. There are no special clocks for the bus, because
2020
the SDMA controller itself has its interrupt and clock assignments.
2121
22+
EMI (External Memory Interface) for legacy i.MX35.
23+
2224
select:
2325
properties:
2426
compatible:
2527
contains:
26-
const: fsl,spba-bus
28+
enum:
29+
- fsl,aips
30+
- fsl,emi
31+
- fsl,spba-bus
2732
required:
2833
- compatible
2934

3035
properties:
3136
$nodename:
32-
pattern: "^spba-bus(@[0-9a-f]+)?$"
37+
pattern: "^((spba|emi)-bus|bus)(@[0-9a-f]+)?$"
3338

3439
compatible:
3540
items:
36-
- const: fsl,spba-bus
41+
- enum:
42+
- fsl,aips
43+
- fsl,emi
44+
- fsl,spba-bus
3745
- const: simple-bus
3846

3947
'#address-cells':

0 commit comments

Comments
 (0)