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

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

Pull devicetree updates from Rob Herring:

 - Sync dtc to upstream version v1.6.0-51-g183df9e9c2b9 and build host
   fdtoverlay

 - Add kbuild support to build DT overlays (%.dtbo)

 - Drop NULLifying match table in of_match_device().

   In preparation for this, there are several driver cleanups to use
   (of_)?device_get_match_data().

 - Drop pointless wrappers from DT struct device API

 - Convert USB binding schemas to use graph schema and remove old plain
   text graph binding doc

 - Convert spi-nor and v3d GPU bindings to DT schema

 - Tree wide schema fixes for if/then schemas, array size constraints,
   and undocumented compatible strings in examples

 - Handle 'no-map' correctly for already reserved memblock regions

* tag 'devicetree-for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (35 commits)
  driver core: platform: Drop of_device_node_put() wrapper
  of: Remove of_dev_{get,put}()
  dt-bindings: usb: Change descibe to describe in usbmisc-imx.txt
  dt-bindings: can: rcar_canfd: Group tuples in pin control properties
  dt-bindings: power: renesas,apmu: Group tuples in cpus properties
  dt-bindings: mtd: spi-nor: Convert to DT schema format
  dt-bindings: Use portable sort for version cmp
  dt-bindings: ethernet-controller: fix fixed-link specification
  dt-bindings: irqchip: Add node name to PRUSS INTC
  dt-bindings: interconnect: Fix the expected number of cells
  dt-bindings: Fix errors in 'if' schemas
  dt-bindings: iommu: renesas,ipmmu-vmsa: Make 'power-domains' conditionally required
  dt-bindings: Fix undocumented compatible strings in examples
  kbuild: Add support to build overlays (%.dtbo)
  scripts: dtc: Remove the unused fdtdump.c file
  scripts: dtc: Build fdtoverlay tool
  scripts/dtc: Update to upstream version v1.6.0-51-g183df9e9c2b9
  scripts: dtc: Fetch fdtoverlay.c from external DTC project
  dt-bindings: thermal: sun8i: Fix misplaced schema keyword in compatible strings
  dt-bindings: iio: dac: Fix AD5686 references
  ...
parents 882d6edf cb8be8b4

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
*.c.[012]*.*

*.dt.yaml

*.dtb

*.dtbo

*.dtb.S

*.dwo

*.elf

Documentation/devicetree/bindings/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ DT_SCHEMA_MIN_VERSION = 2020.8.1 
PHONY += check_dtschema_version

check_dtschema_version:

	@{ echo $(DT_SCHEMA_MIN_VERSION); \

	$(DT_DOC_CHECKER) --version 2>/dev/null || echo 0; } | sort -VC || \

	$(DT_DOC_CHECKER) --version 2>/dev/null || echo 0; } | sort -Vc >/dev/null || \

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



quiet_cmd_extract_ex = DTEX    $@

Documentation/devicetree/bindings/ata/sata_highbank.yaml

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ properties: 
    maxItems: 8



  calxeda,sgpio-gpio:

    maxItems: 3

    description: |

      phandle-gpio bank, bit offset, and default on or off, which indicates

      that the driver supports SGPIO indicator lights using the indicated

Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml→Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clks.yaml

+2 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0+

%YAML 1.2

---

$id: http://devicetree.org/schemas/clock/allwinner,sun9i-a80-usb-clocks.yaml#

$id: http://devicetree.org/schemas/clock/allwinner,sun9i-a80-usb-clks.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Allwinner A80 USB Clock Controller Device Tree Bindings
@@ -18,7 +18,7 @@ properties: 
    const: 1



  compatible:

    const: allwinner,sun9i-a80-usb-clocks

    const: allwinner,sun9i-a80-usb-clks



  reg:

    maxItems: 1

Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml

+2 −2
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ properties: 
      - arm,syscon-icst525-integratorcp-cm-mem

      - arm,integrator-cm-auxosc

      - arm,versatile-cm-auxosc

      - arm,impd-vco1

      - arm,impd-vco2

      - arm,impd1-vco1

      - arm,impd1-vco2



  clocks:

    description: Parent clock for the ICST VCO