Commit 0080665f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull devicetree updates from Rob Herring:

 - Refactor powerpc and arm64 kexec DT handling to common code. This
   enables IMA on arm64.

 - Add kbuild support for applying DT overlays at build time. The first
   user are the DT unittests.

 - Fix kerneldoc formatting and W=1 warnings in drivers/of/

 - Fix handling 64-bit flag on PCI resources

 - Bump dtschema version required to v2021.2.1

 - Enable undocumented compatible checks for dtbs_check. This allows
   tracking of missing binding schemas.

 - DT docs improvements. Regroup the DT docs and add the example schema
   and DT kernel ABI docs to the doc build.

 - Convert Broadcom Bluetooth and video-mux bindings to schema

 - Add QCom sm8250 Venus video codec binding schema

 - Add vendor prefixes for AESOP, YIC System Co., Ltd, and Siliconfile
   Technologies Inc.

 - Cleanup of DT schema type references on common properties and
   standard unit properties

* tag 'devicetree-for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (64 commits)
  powerpc: If kexec_build_elf_info() fails return immediately from elf64_load()
  powerpc: Free fdt on error in elf64_load()
  of: overlay: Fix kerneldoc warning in of_overlay_remove()
  of: linux/of.h: fix kernel-doc warnings
  of/pci: Add IORESOURCE_MEM_64 to resource flags for 64-bit memory addresses
  dt-bindings: bcm4329-fmac: add optional brcm,ccode-map
  docs: dt: update writing-schema.rst references
  dt-bindings: media: venus: Add sm8250 dt schema
  of: base: Fix spelling issue with function param 'prop'
  docs: dt: Add DT API documentation
  of: Add missing 'Return' section in kerneldoc comments
  of: Fix kerneldoc output formatting
  docs: dt: Group DT docs into relevant sub-sections
  docs: dt: Make 'Devicetree' wording more consistent
  docs: dt: writing-schema: Include the example schema in the doc build
  docs: dt: writing-schema: Remove spurious indentation
  dt-bindings: Fix reference in submitting-patches.rst to the DT ABI doc
  dt-bindings: ddr: Add optional manufacturer and revision ID to LPDDR3
  dt-bindings: media: video-interfaces: Drop the example
  devicetree: bindings: clock: Minor typo fix in the file armada3700-tbg-clock.txt
  ...
parents 5a69e9bc 031cc263

Documentation/devicetree/bindings/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ DT_MK_SCHEMA ?= dt-mk-schema 


DT_SCHEMA_LINT = $(shell which yamllint)



DT_SCHEMA_MIN_VERSION = 2020.8.1

DT_SCHEMA_MIN_VERSION = 2021.2.1



PHONY += check_dtschema_version

check_dtschema_version:
@@ -55,6 +55,9 @@ override DTC_FLAGS := \ 
	-Wno-graph_child_address \

	-Wno-interrupt_provider



# Disable undocumented compatible checks until warning free

override DT_CHECKER_FLAGS ?=



$(obj)/processed-schema-examples.json: $(DT_DOCS) $(src)/.yamllint check_dtschema_version FORCE

	$(call if_changed_rule,chkdt)

Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml

+1 −4
Original line number Diff line number Diff line
@@ -26,10 +26,7 @@ properties: 
      - const: simple-mfd



  mboxes:

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

    description: |

      Phandle to the firmware device's Mailbox.

      (See: ../mailbox/mailbox.txt for more information)

    maxItems: 1



  clocks:

    type: object

Documentation/devicetree/bindings/arm/cpus.yaml

+0 −2
Original line number Diff line number Diff line
@@ -258,13 +258,11 @@ properties: 
      where voltage is in V, frequency is in MHz.



  power-domains:

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

    description:

      List of phandles and PM domain specifiers, as defined by bindings of the

      PM domain provider (see also ../power_domain.txt).



  power-domain-names:

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

    description:

      A list of power domain name strings sorted in the same order as the

      power-domains property.

Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-pll1-clk.yaml

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ examples: 
  - |

    clk@1c20000 {

        #clock-cells = <0>;

        compatible = "allwinner,sun4i-a10-pll1";

        compatible = "allwinner,sun4i-a10-pll1-clk";

        reg = <0x01c20000 0x4>;

        clocks = <&osc24M>;

        clock-output-names = "osc24M";

Documentation/devicetree/bindings/clock/armada3700-tbg-clock.txt

+1 −1
Original line number Diff line number Diff line 
* Time Base Generator Clock bindings for Marvell Armada 37xx SoCs



Marvell Armada 37xx SoCs provde Time Base Generator clocks which are

Marvell Armada 37xx SoCs provide Time Base Generator clocks which are

used as parent clocks for the peripheral clocks.



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