Skip to content

Commit a99163e

Browse files
committed
Merge tag 'devicetree-for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree updates from Rob Herring: - Sync dtc to upstream version v1.6.0-51-g183df9e9c2b9 and build host fdtoverlay - Add kbuild support to build DT overlays (%.dtbo) - Drop NULLifying match table in of_match_device(). In preparation for this, there are several driver cleanups to use (of_)?device_get_match_data(). - Drop pointless wrappers from DT struct device API - Convert USB binding schemas to use graph schema and remove old plain text graph binding doc - Convert spi-nor and v3d GPU bindings to DT schema - Tree wide schema fixes for if/then schemas, array size constraints, and undocumented compatible strings in examples - Handle 'no-map' correctly for already reserved memblock regions * tag 'devicetree-for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (35 commits) driver core: platform: Drop of_device_node_put() wrapper of: Remove of_dev_{get,put}() dt-bindings: usb: Change descibe to describe in usbmisc-imx.txt dt-bindings: can: rcar_canfd: Group tuples in pin control properties dt-bindings: power: renesas,apmu: Group tuples in cpus properties dt-bindings: mtd: spi-nor: Convert to DT schema format dt-bindings: Use portable sort for version cmp dt-bindings: ethernet-controller: fix fixed-link specification dt-bindings: irqchip: Add node name to PRUSS INTC dt-bindings: interconnect: Fix the expected number of cells dt-bindings: Fix errors in 'if' schemas dt-bindings: iommu: renesas,ipmmu-vmsa: Make 'power-domains' conditionally required dt-bindings: Fix undocumented compatible strings in examples kbuild: Add support to build overlays (%.dtbo) scripts: dtc: Remove the unused fdtdump.c file scripts: dtc: Build fdtoverlay tool scripts/dtc: Update to upstream version v1.6.0-51-g183df9e9c2b9 scripts: dtc: Fetch fdtoverlay.c from external DTC project dt-bindings: thermal: sun8i: Fix misplaced schema keyword in compatible strings dt-bindings: iio: dac: Fix AD5686 references ...
2 parents 882d6ed + cb8be8b commit a99163e

File tree

147 files changed

+824
-710
lines changed

Some content is hidden

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

147 files changed

+824
-710
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*.c.[012]*.*
1919
*.dt.yaml
2020
*.dtb
21+
*.dtbo
2122
*.dtb.S
2223
*.dwo
2324
*.elf

Documentation/devicetree/bindings/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ DT_SCHEMA_MIN_VERSION = 2020.8.1
1010
PHONY += check_dtschema_version
1111
check_dtschema_version:
1212
@{ echo $(DT_SCHEMA_MIN_VERSION); \
13-
$(DT_DOC_CHECKER) --version 2>/dev/null || echo 0; } | sort -VC || \
13+
$(DT_DOC_CHECKER) --version 2>/dev/null || echo 0; } | sort -Vc >/dev/null || \
1414
{ echo "ERROR: dtschema minimum version is v$(DT_SCHEMA_MIN_VERSION)" >&2; false; }
1515

1616
quiet_cmd_extract_ex = DTEX $@

Documentation/devicetree/bindings/arm/socionext/socionext,uniphier-system-cache.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ properties:
3030
Interrupts can be used to notify the completion of cache operations.
3131
The number of interrupts should match to the number of CPU cores.
3232
The specified interrupts correspond to CPU0, CPU1, ... in this order.
33-
minItems: 1
34-
maxItems: 4
33+
minItems: 1
34+
maxItems: 4
3535

3636
cache-unified: true
3737

Documentation/devicetree/bindings/ata/sata_highbank.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ properties:
6161
maxItems: 8
6262

6363
calxeda,sgpio-gpio:
64+
maxItems: 3
6465
description: |
6566
phandle-gpio bank, bit offset, and default on or off, which indicates
6667
that the driver supports SGPIO indicator lights using the indicated

Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml renamed to Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clks.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0+
22
%YAML 1.2
33
---
4-
$id: http://devicetree.org/schemas/clock/allwinner,sun9i-a80-usb-clocks.yaml#
4+
$id: http://devicetree.org/schemas/clock/allwinner,sun9i-a80-usb-clks.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: Allwinner A80 USB Clock Controller Device Tree Bindings
@@ -18,7 +18,7 @@ properties:
1818
const: 1
1919

2020
compatible:
21-
const: allwinner,sun9i-a80-usb-clocks
21+
const: allwinner,sun9i-a80-usb-clks
2222

2323
reg:
2424
maxItems: 1

Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ properties:
6666
- arm,syscon-icst525-integratorcp-cm-mem
6767
- arm,integrator-cm-auxosc
6868
- arm,versatile-cm-auxosc
69-
- arm,impd-vco1
70-
- arm,impd-vco2
69+
- arm,impd1-vco1
70+
- arm,impd1-vco2
7171

7272
clocks:
7373
description: Parent clock for the ICST VCO

Documentation/devicetree/bindings/clock/canaan,k210-clk.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ properties:
2222
const: canaan,k210-clk
2323

2424
clocks:
25+
maxItems: 1
2526
description:
2627
Phandle of the SoC 26MHz fixed-rate oscillator clock.
2728

Documentation/devicetree/bindings/connector/usb-connector.yaml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -155,22 +155,23 @@ properties:
155155
power dual role.
156156

157157
ports:
158-
description: OF graph bindings (specified in bindings/graph.txt) that model
159-
any data bus to the connector unless the bus is between parent node and
160-
the connector. Since a single connector can have multiple data buses every
161-
bus has an assigned OF graph port number as described below.
162-
type: object
158+
$ref: /schemas/graph.yaml#/properties/ports
159+
description: OF graph bindings modeling any data bus to the connector
160+
unless the bus is between parent node and the connector. Since a single
161+
connector can have multiple data buses every bus has an assigned OF graph
162+
port number as described below.
163+
163164
properties:
164165
port@0:
165-
type: object
166+
$ref: /schemas/graph.yaml#/properties/port
166167
description: High Speed (HS), present in all connectors.
167168

168169
port@1:
169-
type: object
170+
$ref: /schemas/graph.yaml#/properties/port
170171
description: Super Speed (SS), present in SS capable connectors.
171172

172173
port@2:
173-
type: object
174+
$ref: /schemas/graph.yaml#/properties/port
174175
description: Sideband Use (SBU), present in USB-C. This describes the
175176
alternate mode connection of which SBU is a part.
176177

Documentation/devicetree/bindings/crypto/allwinner,sun8i-ce.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ properties:
4646
if:
4747
properties:
4848
compatible:
49-
items:
50-
const: allwinner,sun50i-h6-crypto
49+
const: allwinner,sun50i-h6-crypto
5150
then:
5251
properties:
5352
clocks:

Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ examples:
6666
#include <dt-bindings/soc/ti,sci_pm_domain.h>
6767
6868
main_crypto: crypto@4e00000 {
69-
compatible = "ti,j721-sa2ul";
69+
compatible = "ti,j721e-sa2ul";
7070
reg = <0x4e00000 0x1200>;
7171
power-domains = <&k3_pds 264 TI_SCI_PD_EXCLUSIVE>;
7272
dmas = <&main_udmap 0xc000>, <&main_udmap 0x4000>,

0 commit comments

Comments
 (0)