Skip to content

Commit 684c8cc

Browse files
committed
Merge tag 'devicetree-fixes-for-5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes from Rob Herring: - Sync dtc to upstream to pick up fixes for I2C bus checks and quiet warnings - Various fixes for DT binding check warnings - A couple of build fixes/improvements for binding checks - ReST formatting improvements for writing-schema.rst - Document reference fixes * tag 'devicetree-fixes-for-5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: dt-bindings: clock: imx: Fix e-mail address dt-bindings: thermal: k3: Fix the reg property dt-bindings: thermal: Remove soc unit address dt-bindings: display: arm: versatile: Pass the sysreg unit name dt-bindings: usb: aspeed: Remove the leading zeroes dt-bindings: copy process-schema-examples.yaml to process-schema.yaml dt-bindings: do not build processed-schema.yaml for 'make dt_binding_check' dt-bindings: fix error in 'make clean' after 'make dt_binding_check' dt-bindings: mailbox: zynqmp_ipi: fix unit address dt-bindings: bus: uniphier-system-bus: fix warning in example scripts/dtc: Update to upstream version v1.6.0-11-g9d7888cbf19c doc: devicetree: bindings: fix spelling mistake docs: dt: minor adjustments at writing-schema.rst dt: fix reference to olpc,xo1.75-ec.txt dt: Fix broken references to renamed docs dt: fix broken links due to txt->yaml renames dt: update a reference for reneases pcar file renamed to yaml
2 parents 45564bc + 0115e6c commit 684c8cc

38 files changed

+159
-61
lines changed

Documentation/devicetree/bindings/Makefile

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
DT_DOC_CHECKER ?= dt-doc-validate
33
DT_EXTRACT_EX ?= dt-extract-example
44
DT_MK_SCHEMA ?= dt-mk-schema
5-
DT_MK_SCHEMA_USERONLY_FLAG := $(if $(DT_SCHEMA_FILES), -u)
65

76
DT_SCHEMA_MIN_VERSION = 2020.5
87

@@ -35,21 +34,40 @@ quiet_cmd_mk_schema = SCHEMA $@
3534

3635
DT_DOCS = $(shell $(find_cmd) | sed -e 's|^$(srctree)/||')
3736

38-
DT_SCHEMA_FILES ?= $(DT_DOCS)
39-
40-
extra-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES))
41-
extra-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dt.yaml, $(DT_SCHEMA_FILES))
42-
extra-$(CHECK_DT_BINDING) += processed-schema-examples.yaml
43-
4437
override DTC_FLAGS := \
4538
-Wno-avoid_unnecessary_addr_size \
46-
-Wno-graph_child_address
39+
-Wno-graph_child_address \
40+
-Wno-interrupt_provider
4741

4842
$(obj)/processed-schema-examples.yaml: $(DT_DOCS) check_dtschema_version FORCE
4943
$(call if_changed,mk_schema)
5044

51-
$(obj)/processed-schema.yaml: DT_MK_SCHEMA_FLAGS := $(DT_MK_SCHEMA_USERONLY_FLAG)
45+
ifeq ($(DT_SCHEMA_FILES),)
46+
47+
# Unless DT_SCHEMA_FILES is specified, use the full schema for dtbs_check too.
48+
# Just copy processed-schema-examples.yaml
49+
50+
$(obj)/processed-schema.yaml: $(obj)/processed-schema-examples.yaml FORCE
51+
$(call if_changed,copy)
52+
53+
DT_SCHEMA_FILES = $(DT_DOCS)
54+
55+
else
56+
57+
# If DT_SCHEMA_FILES is specified, use it for processed-schema.yaml
58+
59+
$(obj)/processed-schema.yaml: DT_MK_SCHEMA_FLAGS := -u
5260
$(obj)/processed-schema.yaml: $(DT_SCHEMA_FILES) check_dtschema_version FORCE
5361
$(call if_changed,mk_schema)
5462

55-
extra-y += processed-schema.yaml
63+
endif
64+
65+
extra-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES))
66+
extra-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dt.yaml, $(DT_SCHEMA_FILES))
67+
extra-$(CHECK_DT_BINDING) += processed-schema-examples.yaml
68+
extra-$(CHECK_DTBS) += processed-schema.yaml
69+
70+
# Hack: avoid 'Argument list too long' error for 'make clean'. Remove most of
71+
# build artifacts here before they are processed by scripts/Makefile.clean
72+
clean-files = $(shell find $(obj) \( -name '*.example.dts' -o \
73+
-name '*.example.dt.yaml' \) -delete 2>/dev/null)

Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Required properties:
4747
&lsio_mu1 1 2
4848
&lsio_mu1 1 3
4949
&lsio_mu1 3 3>;
50-
See Documentation/devicetree/bindings/mailbox/fsl,mu.txt
50+
See Documentation/devicetree/bindings/mailbox/fsl,mu.yaml
5151
for detailed mailbox binding.
5252

5353
Note: Each mu which supports general interrupt should have an alias correctly

Documentation/devicetree/bindings/bus/socionext,uniphier-system-bus.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,14 @@ examples:
8080
ranges = <1 0x00000000 0x42000000 0x02000000>,
8181
<5 0x00000000 0x46000000 0x01000000>;
8282
83-
ethernet@1,01f00000 {
83+
ethernet@1,1f00000 {
8484
compatible = "smsc,lan9115";
8585
reg = <1 0x01f00000 0x1000>;
8686
interrupts = <0 48 4>;
8787
phy-mode = "mii";
8888
};
8989
90-
uart@5,00200000 {
90+
serial@5,200000 {
9191
compatible = "ns16550a";
9292
reg = <5 0x00200000 0x20>;
9393
interrupts = <0 49 4>;

Documentation/devicetree/bindings/clock/imx27-clock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Clock bindings for Freescale i.MX27
88

99
maintainers:
10-
- Fabio Estevam <fabio.estevam@freescale.com>
10+
- Fabio Estevam <fabio.estevam@nxp.com>
1111

1212
description: |
1313
The clock consumer should specify the desired clock by having the clock

Documentation/devicetree/bindings/clock/imx31-clock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Clock bindings for Freescale i.MX31
88

99
maintainers:
10-
- Fabio Estevam <fabio.estevam@freescale.com>
10+
- Fabio Estevam <fabio.estevam@nxp.com>
1111

1212
description: |
1313
The clock consumer should specify the desired clock by having the clock

Documentation/devicetree/bindings/clock/imx5-clock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Clock bindings for Freescale i.MX5
88

99
maintainers:
10-
- Fabio Estevam <fabio.estevam@freescale.com>
10+
- Fabio Estevam <fabio.estevam@nxp.com>
1111

1212
description: |
1313
The clock consumer should specify the desired clock by having the clock

Documentation/devicetree/bindings/display/bridge/sii902x.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Optional properties:
3737
simple-card or audio-graph-card binding. See their binding
3838
documents on how to describe the way the sii902x device is
3939
connected to the rest of the audio system:
40-
Documentation/devicetree/bindings/sound/simple-card.txt
40+
Documentation/devicetree/bindings/sound/simple-card.yaml
4141
Documentation/devicetree/bindings/sound/audio-graph-card.txt
4242
Note: In case of the audio-graph-card binding the used port
4343
index should be 3.

Documentation/devicetree/bindings/display/imx/fsl-imx-drm.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Required properties:
6868
datasheet
6969
- clocks : phandle to the PRE axi clock input, as described
7070
in Documentation/devicetree/bindings/clock/clock-bindings.txt and
71-
Documentation/devicetree/bindings/clock/imx6q-clock.txt.
71+
Documentation/devicetree/bindings/clock/imx6q-clock.yaml.
7272
- clock-names: should be "axi"
7373
- interrupts: should contain the PRE interrupt
7474
- fsl,iram: phandle pointing to the mmio-sram device node, that should be
@@ -94,7 +94,7 @@ Required properties:
9494
datasheet
9595
- clocks : phandles to the PRG ipg and axi clock inputs, as described
9696
in Documentation/devicetree/bindings/clock/clock-bindings.txt and
97-
Documentation/devicetree/bindings/clock/imx6q-clock.txt.
97+
Documentation/devicetree/bindings/clock/imx6q-clock.yaml.
9898
- clock-names: should be "ipg" and "axi"
9999
- fsl,pres: phandles to the PRE units attached to this PRG, with the fixed
100100
PRE as the first entry and the muxable PREs following.

Documentation/devicetree/bindings/display/imx/ldb.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ Required properties:
3030
"di2_sel" - IPU2 DI0 mux
3131
"di3_sel" - IPU2 DI1 mux
3232
The needed clock numbers for each are documented in
33-
Documentation/devicetree/bindings/clock/imx5-clock.txt, and in
34-
Documentation/devicetree/bindings/clock/imx6q-clock.txt.
33+
Documentation/devicetree/bindings/clock/imx5-clock.yaml, and in
34+
Documentation/devicetree/bindings/clock/imx6q-clock.yaml.
3535

3636
Optional properties:
3737
- pinctrl-names : should be "default" on i.MX53, not used on i.MX6q

Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ additionalProperties: false
3333

3434
examples:
3535
- |
36-
sysreg {
36+
sysreg@0 {
3737
compatible = "arm,versatile-sysreg", "syscon", "simple-mfd";
3838
reg = <0x00000 0x1000>;
3939

0 commit comments

Comments
 (0)