Commit 571d54ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents 9d71d3cd 8211d1e8

Documentation/arm/microchip.rst

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ Device Tree files and Device Tree bindings that apply to AT91 SoCs and boards ar 
considered as "Unstable". To be completely clear, any at91 binding can change at

any time. So, be sure to use a Device Tree Binary and a Kernel Image generated from

the same source tree.

Please refer to the Documentation/devicetree/bindings/ABI.txt file for a

Please refer to the Documentation/devicetree/bindings/ABI.rst file for a

definition of a "Stable" binding/ABI.

This statement will be removed by AT91 MAINTAINERS when appropriate.

Documentation/devicetree/bindings/ABI.txt→Documentation/devicetree/bindings/ABI.rst

+4 −1
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



===================

Devicetree (DT) ABI

===================



I. Regarding stable bindings/ABI, we quote from the 2013 ARM mini-summit

   summary document:

Documentation/devicetree/bindings/Makefile

+11 −3
Original line number Diff line number Diff line
@@ -4,11 +4,19 @@ 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



PHONY += check_dtschema_version

check_dtschema_version:

	@{ echo $(DT_SCHEMA_MIN_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) $< > $@



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

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

	$(call if_changed,chk_binding)



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

	-Wno-graph_child_address



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

$(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)

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

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

	$(call if_changed,mk_schema)



extra-y += processed-schema.yaml

Documentation/devicetree/bindings/arm/amlogic.yaml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ description: |+ 
  any time. Be sure to use a device tree binary and a kernel image

  generated from the same source tree.



  Please refer to Documentation/devicetree/bindings/ABI.txt for a definition of a

  Please refer to Documentation/devicetree/bindings/ABI.rst for a definition of a

  stable binding/ABI.



properties:

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

+15 −19
Original line number Diff line number Diff line
@@ -131,25 +131,22 @@ properties: 
      property, describing the physical location of the children nodes.

      0 means motherboard site, while 1 and 2 are daughterboard sites, and

      0xf means "sisterboard" which is the site containing the main CPU tile.

    allOf:

      - $ref: '/schemas/types.yaml#/definitions/uint32'

      - minimum: 0

    $ref: '/schemas/types.yaml#/definitions/uint32'

    minimum: 0

    maximum: 15



  arm,vexpress,position:

    description: When daughterboards are stacked on one site, their position

      in the stack be be described this attribute.

    allOf:

      - $ref: '/schemas/types.yaml#/definitions/uint32'

      - minimum: 0

    $ref: '/schemas/types.yaml#/definitions/uint32'

    minimum: 0

    maximum: 3



  arm,vexpress,dcc:

    description: When describing tiles consisting of more than one DCC, its

      number can be specified with this attribute.

    allOf:

      - $ref: '/schemas/types.yaml#/definitions/uint32'

      - minimum: 0

    $ref: '/schemas/types.yaml#/definitions/uint32'

    minimum: 0

    maximum: 3



patternProperties:
@@ -162,8 +159,7 @@ patternProperties: 
      "simple-bus". If the compatible is placed in the "motherboard" node,

      it is stricter and always has two compatibles.

    type: object

    allOf:

      - $ref: '/schemas/simple-bus.yaml'

    $ref: '/schemas/simple-bus.yaml'



    properties:

      compatible:
@@ -195,11 +191,11 @@ patternProperties: 
              - const: simple-bus

          arm,v2m-memory-map:

            description: This describes the memory map type.

            allOf:

              - $ref: '/schemas/types.yaml#/definitions/string'

              - enum:

            $ref: '/schemas/types.yaml#/definitions/string'

            enum:

              - rs1

              - rs2



        required:

          - compatible

    required:

CRA Git | Maintained and supported by SUSTech CRA and CCSE