Skip to content

Commit 571d54e

Browse files
committed
Merge tag 'devicetree-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree updates from Rob Herring: - Convert various DT (non-binding) doc files to ReST - Various improvements to device link code - Fix __of_attach_node_sysfs refcounting bug - Add support for 'memory-region-names' with reserved-memory binding - Vendor prefixes for Protonic Holland, BeagleBoard.org, Alps, Check Point, Würth Elektronik, U-Boot, Vaisala, Baikal Electronics, Shanghai Awinic Technology Co., MikroTik, Silex Insight - A bunch more binding conversions to DT schema. Only 3K to go. - Add a minimum version check for schema tools - Treewide dropping of 'allOf' usage with schema references. Not needed in new json-schema spec. - Some formatting clean-ups of schemas * tag 'devicetree-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (194 commits) dt-bindings: clock: Add documentation for X1830 bindings. dt-bindings: mailbox: Convert imx mu to json-schema dt-bindings: power: Convert imx gpcv2 to json-schema dt-bindings: power: Convert imx gpc to json-schema dt-bindings: Merge gpio-usb-b-connector with usb-connector dt-bindings: timer: renesas: cmt: Convert to json-schema dt-bindings: clock: Convert i.MX8QXP LPCG to json-schema dt-bindings: timer: Convert i.MX GPT to json-schema dt-bindings: thermal: rcar-thermal: Add device tree support for r8a7742 dt-bindings: serial: Add binding for UART pin swap dt-bindings: geni-se: Add interconnect binding for GENI QUP dt-bindings: geni-se: Convert QUP geni-se bindings to YAML dt-bindings: vendor-prefixes: Add Silex Insight vendor prefix dt-bindings: input: touchscreen: edt-ft5x06: change reg property dt-bindings: usb: qcom,dwc3: Introduce interconnect properties for Qualcomm DWC3 driver dt-bindings: timer: renesas: mtu2: Convert to json-schema of/fdt: Remove redundant kbasename function call dt-bindings: clock: Convert i.MX1 clock to json-schema dt-bindings: clock: Convert i.MX21 clock to json-schema dt-bindings: clock: Convert i.MX25 clock to json-schema ...
2 parents 9d71d3c + 8211d1e commit 571d54e

File tree

469 files changed

+11739
-7435
lines changed

Some content is hidden

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

469 files changed

+11739
-7435
lines changed

Documentation/arm/microchip.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ Device Tree files and Device Tree bindings that apply to AT91 SoCs and boards ar
192192
considered as "Unstable". To be completely clear, any at91 binding can change at
193193
any time. So, be sure to use a Device Tree Binary and a Kernel Image generated from
194194
the same source tree.
195-
Please refer to the Documentation/devicetree/bindings/ABI.txt file for a
195+
Please refer to the Documentation/devicetree/bindings/ABI.rst file for a
196196
definition of a "Stable" binding/ABI.
197197
This statement will be removed by AT91 MAINTAINERS when appropriate.
198198

Documentation/devicetree/bindings/ABI.txt renamed to Documentation/devicetree/bindings/ABI.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
.. SPDX-License-Identifier: GPL-2.0
12
2-
Devicetree (DT) ABI
3+
===================
4+
Devicetree (DT) ABI
5+
===================
36

47
I. Regarding stable bindings/ABI, we quote from the 2013 ARM mini-summit
58
summary document:

Documentation/devicetree/bindings/Makefile

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,19 @@ DT_EXTRACT_EX ?= dt-extract-example
44
DT_MK_SCHEMA ?= dt-mk-schema
55
DT_MK_SCHEMA_USERONLY_FLAG := $(if $(DT_SCHEMA_FILES), -u)
66

7+
DT_SCHEMA_MIN_VERSION = 2020.5
8+
9+
PHONY += check_dtschema_version
10+
check_dtschema_version:
11+
@{ echo $(DT_SCHEMA_MIN_VERSION); \
12+
$(DT_DOC_CHECKER) --version 2>/dev/null || echo 0; } | sort -VC || \
13+
{ echo "ERROR: dtschema minimum version is v$(DT_SCHEMA_MIN_VERSION)" >&2; false; }
14+
715
quiet_cmd_chk_binding = CHKDT $(patsubst $(srctree)/%,%,$<)
816
cmd_chk_binding = $(DT_DOC_CHECKER) -u $(srctree)/$(src) $< ; \
917
$(DT_EXTRACT_EX) $< > $@
1018

11-
$(obj)/%.example.dts: $(src)/%.yaml FORCE
19+
$(obj)/%.example.dts: $(src)/%.yaml check_dtschema_version FORCE
1220
$(call if_changed,chk_binding)
1321

1422
# Use full schemas when checking %.example.dts
@@ -37,11 +45,11 @@ override DTC_FLAGS := \
3745
-Wno-avoid_unnecessary_addr_size \
3846
-Wno-graph_child_address
3947

40-
$(obj)/processed-schema-examples.yaml: $(DT_DOCS) FORCE
48+
$(obj)/processed-schema-examples.yaml: $(DT_DOCS) check_dtschema_version FORCE
4149
$(call if_changed,mk_schema)
4250

4351
$(obj)/processed-schema.yaml: DT_MK_SCHEMA_FLAGS := $(DT_MK_SCHEMA_USERONLY_FLAG)
44-
$(obj)/processed-schema.yaml: $(DT_SCHEMA_FILES) FORCE
52+
$(obj)/processed-schema.yaml: $(DT_SCHEMA_FILES) check_dtschema_version FORCE
4553
$(call if_changed,mk_schema)
4654

4755
extra-y += processed-schema.yaml

Documentation/devicetree/bindings/arm/altera.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ properties:
1313
compatible:
1414
items:
1515
- enum:
16-
- altr,socfpga-cyclone5
17-
- altr,socfpga-arria5
18-
- altr,socfpga-arria10
16+
- altr,socfpga-cyclone5
17+
- altr,socfpga-arria5
18+
- altr,socfpga-arria10
1919
- const: altr,socfpga
2020
...

Documentation/devicetree/bindings/arm/amlogic.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ description: |+
1717
any time. Be sure to use a device tree binary and a kernel image
1818
generated from the same source tree.
1919
20-
Please refer to Documentation/devicetree/bindings/ABI.txt for a definition of a
20+
Please refer to Documentation/devicetree/bindings/ABI.rst for a definition of a
2121
stable binding/ABI.
2222
2323
properties:

Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ select:
2525

2626
properties:
2727
compatible:
28-
items:
28+
items:
2929
- const: amlogic,meson-gx-ao-secure
3030
- const: syscon
3131

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

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -131,26 +131,23 @@ properties:
131131
property, describing the physical location of the children nodes.
132132
0 means motherboard site, while 1 and 2 are daughterboard sites, and
133133
0xf means "sisterboard" which is the site containing the main CPU tile.
134-
allOf:
135-
- $ref: '/schemas/types.yaml#/definitions/uint32'
136-
- minimum: 0
137-
maximum: 15
134+
$ref: '/schemas/types.yaml#/definitions/uint32'
135+
minimum: 0
136+
maximum: 15
138137

139138
arm,vexpress,position:
140139
description: When daughterboards are stacked on one site, their position
141140
in the stack be be described this attribute.
142-
allOf:
143-
- $ref: '/schemas/types.yaml#/definitions/uint32'
144-
- minimum: 0
145-
maximum: 3
141+
$ref: '/schemas/types.yaml#/definitions/uint32'
142+
minimum: 0
143+
maximum: 3
146144

147145
arm,vexpress,dcc:
148146
description: When describing tiles consisting of more than one DCC, its
149147
number can be specified with this attribute.
150-
allOf:
151-
- $ref: '/schemas/types.yaml#/definitions/uint32'
152-
- minimum: 0
153-
maximum: 3
148+
$ref: '/schemas/types.yaml#/definitions/uint32'
149+
minimum: 0
150+
maximum: 3
154151

155152
patternProperties:
156153
"^bus@[0-9a-f]+$":
@@ -162,8 +159,7 @@ patternProperties:
162159
"simple-bus". If the compatible is placed in the "motherboard" node,
163160
it is stricter and always has two compatibles.
164161
type: object
165-
allOf:
166-
- $ref: '/schemas/simple-bus.yaml'
162+
$ref: '/schemas/simple-bus.yaml'
167163

168164
properties:
169165
compatible:
@@ -195,11 +191,11 @@ patternProperties:
195191
- const: simple-bus
196192
arm,v2m-memory-map:
197193
description: This describes the memory map type.
198-
allOf:
199-
- $ref: '/schemas/types.yaml#/definitions/string'
200-
- enum:
201-
- rs1
202-
- rs2
194+
$ref: '/schemas/types.yaml#/definitions/string'
195+
enum:
196+
- rs1
197+
- rs2
198+
203199
required:
204200
- compatible
205201
required:

Documentation/devicetree/bindings/arm/bitmain.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ properties:
1313
compatible:
1414
items:
1515
- enum:
16-
- bitmain,sophon-edge
16+
- bitmain,sophon-edge
1717
- const: bitmain,bm1880
1818
...
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/arm/calxeda/hb-sregs.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Calxeda Highbank system registers
8+
9+
description: |
10+
The Calxeda Highbank system has a block of MMIO registers controlling
11+
several generic system aspects. Those can be used to control some power
12+
management, they also contain some gate and PLL clocks.
13+
14+
maintainers:
15+
- Andre Przywara <[email protected]>
16+
17+
properties:
18+
compatible:
19+
const: calxeda,hb-sregs
20+
21+
reg:
22+
maxItems: 1
23+
24+
clocks:
25+
type: object
26+
27+
required:
28+
- compatible
29+
- reg
30+
31+
additionalProperties: false
32+
33+
examples:
34+
- |
35+
sregs@fff3c000 {
36+
compatible = "calxeda,hb-sregs";
37+
reg = <0xfff3c000 0x1000>;
38+
39+
clocks {
40+
#address-cells = <1>;
41+
#size-cells = <0>;
42+
43+
osc: oscillator {
44+
#clock-cells = <0>;
45+
compatible = "fixed-clock";
46+
clock-frequency = <33333000>;
47+
};
48+
};
49+
};

Documentation/devicetree/bindings/arm/calxeda/l2ecc.txt

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

0 commit comments

Comments
 (0)