Commit f888bdf9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devicetree-for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux 

Pull devicetree updates from Rob Herring:

 - Update dtc to upstream version v1.6.0-31-gcbca977ea121

 - dtx_diff help text reformatting

 - Speed-up validation time for binding and dtb checks using json for
   intermediate files

 - Add support for running yamllint on DT schema files

 - Remove old booting-without-of.rst

 - Extend the example schema to address common issues

 - Cleanup handling of additionalProperties/unevaluatedProperties

 - Ensure all DSI controller schemas reference dsi-controller.yaml

 - Vendor prefixes for Zealz, Wandbord/Technexion, Embest RIoT, Rex,
   DFI, and Cisco Meraki

 - Convert at25, SPMI bus, TI hwlock, HiSilicon Hi3660 USB3 PHY, Arm
   SP805 watchdog, Arm SP804, and Samsung 11-pin USB connector to DT
   schema

 - Convert HiSilicon SoC and syscon bindings to DT schema

 - Convert SiFive Risc-V L2 cache, PLIC, PRCI, and PWM to DT schema

 - Convert i.MX bindings for w1, crypto, rng, SIM, PM, DDR, SATA, vf610
   GPIO, and UART to DT schema

 - Add i.MX 8M compatible strings

 - Add LM81 and DS1780 as trivial devices

 - Various missing properties added to fix dtb validation warnings

* tag 'devicetree-for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (111 commits)
  dt-bindings: misc: explicitly add #address-cells for slave mode
  spi: dt-bindings: spi-controller: explicitly require #address-cells=<0> for slave mode
  dt: Remove booting-without-of.rst
  dt-bindings: update usb-c-connector example
  dt-bindings: arm: hisilicon: add missing properties into cpuctrl.yaml
  dt-bindings: arm: hisilicon: add missing properties into sysctrl.yaml
  dt-bindings: pwm: imx: document i.MX compatibles
  scripts/dtc: Update to upstream version v1.6.0-31-gcbca977ea121
  dt-bindings: Add running yamllint to dt_binding_check
  dt-bindings: powerpc: Add a schema for the 'sleep' property
  dt-bindings: pinctrl: sirf: Fix typo abitrary
  dt-bindings: pinctrl: qcom: Fix typo abitrary
  dt-bindings: Explicitly allow additional properties in common schemas
  dt-bindings: Use 'additionalProperties' instead of 'unevaluatedProperties'
  dt-bindings: Add missing 'unevaluatedProperties'
  Docs: Fixing spelling errors in Documentation/devicetree/bindings/
  dt-bindings: arm: hisilicon: convert Hi6220 domain controller bindings to json-schema
  dt-bindings: riscv: convert pwm bindings to json-schema
  dt-bindings: riscv: convert plic bindings to json-schema
  dt-bindings: fu540: prci: convert PRCI bindings to json-schema
  ...
parents b4e1bce8 bd36e51d

Documentation/devicetree/bindings/.gitignore

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

*.example.dts

processed-schema*.yaml

processed-schema*.json

Documentation/devicetree/bindings/.yamllint

0 → 100644
+39 −0
Original line number Diff line number Diff line 
extends: relaxed



rules:

  line-length:

    # 80 chars should be enough, but don't fail if a line is longer

    max: 110

    allow-non-breakable-words: true

    level: warning

  braces:

    min-spaces-inside: 0

    max-spaces-inside: 1

    min-spaces-inside-empty: 0

    max-spaces-inside-empty: 0

  brackets:

    min-spaces-inside: 0

    max-spaces-inside: 1

    min-spaces-inside-empty: 0

    max-spaces-inside-empty: 0

  colons: {max-spaces-before: 0, max-spaces-after: 1}

  commas: {min-spaces-after: 1, max-spaces-after: 1}

  comments:

    require-starting-space: false

    min-spaces-from-content: 1

  comments-indentation: disable

  document-start:

    present: true

  empty-lines:

    max: 3

    max-end: 1

  empty-values:

    forbid-in-block-mappings: true

    forbid-in-flow-mappings: true

  hyphens:

    max-spaces-after: 1

  indentation:

    spaces: 2

    indent-sequences: true

    check-multi-line-strings: false

  trailing-spaces: false

Documentation/devicetree/bindings/Makefile

+34 −18
Original line number Diff line number Diff line
@@ -3,7 +3,9 @@ DT_DOC_CHECKER ?= dt-doc-validate 
DT_EXTRACT_EX ?= dt-extract-example

DT_MK_SCHEMA ?= dt-mk-schema



DT_SCHEMA_MIN_VERSION = 2020.5

DT_SCHEMA_LINT = $(shell which yamllint)



DT_SCHEMA_MIN_VERSION = 2020.8.1



PHONY += check_dtschema_version

check_dtschema_version:
@@ -11,26 +13,40 @@ check_dtschema_version: 
	$(DT_DOC_CHECKER) --version 2>/dev/null || echo 0; } | sort -VC || \

	{ echo "ERROR: dtschema minimum version is v$(DT_SCHEMA_MIN_VERSION)" >&2; false; }



quiet_cmd_chk_binding = CHKDT   $(patsubst $(srctree)/%,%,$<)

      cmd_chk_binding = $(DT_DOC_CHECKER) -u $(srctree)/$(src) $< ; \

                        $(DT_EXTRACT_EX) $< > $@

quiet_cmd_extract_ex = DTEX    $@

      cmd_extract_ex = $(DT_EXTRACT_EX) $< > $@



$(obj)/%.example.dts: $(src)/%.yaml check_dtschema_version FORCE

	$(call if_changed,chk_binding)

	$(call if_changed,extract_ex)



# Use full schemas when checking %.example.dts

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

DT_TMP_SCHEMA := $(obj)/processed-schema-examples.json



find_cmd = find $(srctree)/$(src) \( -name '*.yaml' ! \

		-name 'processed-schema*' ! \

		-name '*.example.dt.yaml' \)



quiet_cmd_yamllint = LINT    $(src)

      cmd_yamllint = $(find_cmd) | \

                     xargs $(DT_SCHEMA_LINT) -f parsable -c $(srctree)/$(src)/.yamllint



quiet_cmd_chk_bindings = CHKDT   $@

      cmd_chk_bindings = $(find_cmd) | \

                         xargs -n200 -P$$(nproc) $(DT_DOC_CHECKER) -u $(srctree)/$(src)



quiet_cmd_mk_schema = SCHEMA  $@

      cmd_mk_schema = rm -f $@ ; \

      cmd_mk_schema = f=$$(mktemp) ; \

                      $(if $(DT_MK_SCHEMA_FLAGS), \

                           echo $(real-prereqs), \

                           $(find_cmd)) | \

                      xargs $(DT_MK_SCHEMA) $(DT_MK_SCHEMA_FLAGS) >> $@

                           $(find_cmd)) > $$f ; \

                      $(DT_MK_SCHEMA) -j $(DT_MK_SCHEMA_FLAGS) @$$f > $@ ; \

		      rm -f $$f



define rule_chkdt

	$(if $(DT_SCHEMA_LINT),$(call cmd,yamllint),)

	$(call cmd,chk_bindings)

	$(call cmd,mk_schema)

endef



DT_DOCS = $(shell $(find_cmd) | sed -e 's|^$(srctree)/||')
@@ -39,33 +55,33 @@ override DTC_FLAGS := \ 
	-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-examples.json: $(DT_DOCS) $(src)/.yamllint check_dtschema_version FORCE

	$(call if_changed_rule,chkdt)



ifeq ($(DT_SCHEMA_FILES),)



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

# Just copy processed-schema-examples.yaml

# Just copy processed-schema-examples.json



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

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

	$(call if_changed,copy)



DT_SCHEMA_FILES = $(DT_DOCS)



else



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

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



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

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

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

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

	$(call if_changed,mk_schema)



endif



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

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

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

Documentation/devicetree/bindings/arm/actions.yaml

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ maintainers: 
  - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>



properties:

  $nodename:

    const: "/"

  compatible:

    oneOf:

      # The Actions Semi S500 is a quad-core ARM Cortex-A9 SoC.

Documentation/devicetree/bindings/arm/altera.yaml

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ maintainers: 
  - Dinh Nguyen <dinguyen@kernel.org>



properties:

  $nodename:

    const: "/"

  compatible:

    items:

      - enum:

CRA Git | Maintained and supported by SUSTech CRA and CCSE