Commit 684c8ccc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 45564bcd 0115e6c9

Documentation/devicetree/bindings/Makefile

+28 −10
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
DT_DOC_CHECKER ?= dt-doc-validate

DT_EXTRACT_EX ?= dt-extract-example

DT_MK_SCHEMA ?= dt-mk-schema

DT_MK_SCHEMA_USERONLY_FLAG := $(if $(DT_SCHEMA_FILES), -u)



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


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



DT_SCHEMA_FILES ?= $(DT_DOCS)



extra-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES))

extra-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dt.yaml, $(DT_SCHEMA_FILES))

extra-$(CHECK_DT_BINDING) += processed-schema-examples.yaml



override DTC_FLAGS := \

	-Wno-avoid_unnecessary_addr_size \

	-Wno-graph_child_address

	-Wno-graph_child_address \

	-Wno-interrupt_provider



$(obj)/processed-schema-examples.yaml: $(DT_DOCS) check_dtschema_version FORCE

	$(call if_changed,mk_schema)



$(obj)/processed-schema.yaml: DT_MK_SCHEMA_FLAGS := $(DT_MK_SCHEMA_USERONLY_FLAG)

ifeq ($(DT_SCHEMA_FILES),)



# Unless DT_SCHEMA_FILES is specified, use the full schema for dtbs_check too.

# Just copy processed-schema-examples.yaml



$(obj)/processed-schema.yaml: $(obj)/processed-schema-examples.yaml FORCE

	$(call if_changed,copy)



DT_SCHEMA_FILES = $(DT_DOCS)



else



# If DT_SCHEMA_FILES is specified, use it for processed-schema.yaml



$(obj)/processed-schema.yaml: DT_MK_SCHEMA_FLAGS := -u

$(obj)/processed-schema.yaml: $(DT_SCHEMA_FILES) check_dtschema_version FORCE

	$(call if_changed,mk_schema)



extra-y += processed-schema.yaml
 
endif



extra-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES))

extra-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dt.yaml, $(DT_SCHEMA_FILES))

extra-$(CHECK_DT_BINDING) += processed-schema-examples.yaml

extra-$(CHECK_DTBS) += processed-schema.yaml



# Hack: avoid 'Argument list too long' error for 'make clean'. Remove most of

# build artifacts here before they are processed by scripts/Makefile.clean

clean-files = $(shell find $(obj) \( -name '*.example.dts' -o \

			-name '*.example.dt.yaml' \) -delete 2>/dev/null)

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

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ Required properties: 
			  &lsio_mu1 1 2

			  &lsio_mu1 1 3

			  &lsio_mu1 3 3>;

		See Documentation/devicetree/bindings/mailbox/fsl,mu.txt

		See Documentation/devicetree/bindings/mailbox/fsl,mu.yaml

		for detailed mailbox binding.



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

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

+2 −2
Original line number Diff line number Diff line
@@ -80,14 +80,14 @@ examples: 
        ranges = <1 0x00000000 0x42000000 0x02000000>,

                 <5 0x00000000 0x46000000 0x01000000>;



        ethernet@1,01f00000 {

        ethernet@1,1f00000 {

            compatible = "smsc,lan9115";

            reg = <1 0x01f00000 0x1000>;

            interrupts = <0 48 4>;

            phy-mode = "mii";

        };



        uart@5,00200000 {

        serial@5,200000 {

            compatible = "ns16550a";

            reg = <5 0x00200000 0x20>;

            interrupts = <0 49 4>;

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

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Clock bindings for Freescale i.MX27



maintainers:

  - Fabio Estevam <fabio.estevam@freescale.com>

  - Fabio Estevam <fabio.estevam@nxp.com>



description: |

  The clock consumer should specify the desired clock by having the clock

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

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Clock bindings for Freescale i.MX31



maintainers:

  - Fabio Estevam <fabio.estevam@freescale.com>

  - Fabio Estevam <fabio.estevam@nxp.com>



description: |

  The clock consumer should specify the desired clock by having the clock

CRA Git | Maintained and supported by SUSTech CRA and CCSE