Commit 098b6e44 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull devicetree updates from Rob Herring:
 "DT core:

   - Sync dtc/libfdt with upstream v1.7.2-62-ga26ef6400bd8

   - Add a for_each_compatible_node_scoped() loop and convert users in
     cpufreq, dmaengine, clk, cdx, powerpc and Arm

   - Simplify of/platform.c with scoped loop helpers

   - Add fw_devlink tracking for "mmc-pwrseq"

   - Optimize fw_devlink callback code size for pinctrl-N properties

   - Replace strcmp_suffix() with strends()

  DT bindings:

   - Support building single binding targets

   - Convert google,goldfish-fb, cznic,turris-mox-rwtm, ti,prm-inst

   - Add bindings for Freescale AVIC, Realtek RTD1xxx system
     controllers, Microchip 25AA010A EEPROM, OnSemi FIN3385, IEI
     WT61P803 PUZZLE, Delta Electronics DPS-800-AB power supply,
     Infineon IR35221 Digital Multi-phase Controller, Infineon PXE1610
     Digital Dual Output 6+1 VR12.5 & VR13 CPU Controller,
     socionext,uniphier-smpctrl, and xlnx,zynqmp-firmware

   - Lots of trivial binding fixes to address warnings in DTS files.
     These are mostly for arm64 platforms which is getting closer to be
     warning free. Some public shaming has helped.

   - Fix I2C bus node names in examples

   - Drop obsolete brcm,vulcan-soc binding

   - Drop unreferenced binding headers"

* tag 'devicetree-for-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (60 commits)
  dt-bindings: interrupt-controller: Add compatiblie string fsl,imx(1|25|27|31|35)-avic
  dt-bindings: soc: imx: add fsl,aips and fsl,emi compatible strings
  dt-bindings: display: bridge: lt8912b: Drop reset gpio requirement
  dt-bindings: firmware: fsl,scu: Mark multi-channel MU layouts as deprecated
  cpufreq: s5pv210: Simplify with scoped for each OF child loop
  dmaengine: fsl_raid: Simplify with scoped for each OF child loop
  clk: imx: imx31: Simplify with scoped for each OF child loop
  clk: imx: imx27: Simplify with scoped for each OF child loop
  cdx: Use mutex guard to simplify error handling
  cdx: Simplify with scoped for each OF child loop
  powerpc/wii: Simplify with scoped for each OF child loop
  powerpc/fsp2: Simplify with scoped for each OF child loop
  ARM: exynos: Simplify with scoped for each OF child loop
  ARM: at91: Simplify with scoped for each OF child loop
  of: Add for_each_compatible_node_scoped() helper
  dt-bindings: Fix emails with spaces or missing brackets
  scripts/dtc: Update to upstream version v1.7.2-62-ga26ef6400bd8
  dt-bindings: crypto: inside-secure,safexcel: Mandate only ring IRQs
  dt-bindings: crypto: inside-secure,safexcel: Add SoC compatibles
  of: reserved_mem: Fix placement of __free() annotation
  ...
parents c6e62d00 a16f91f8

.clang-format

+1 −0
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ ForEachMacros: 
  - 'for_each_collection'

  - 'for_each_comp_order'

  - 'for_each_compatible_node'

  - 'for_each_compatible_node_scoped'

  - 'for_each_component_dais'

  - 'for_each_component_dais_safe'

  - 'for_each_conduit'

Documentation/devicetree/bindings/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ DT_DOCS = $(patsubst $(srctree)/%,%,$(shell $(find_all_cmd))) 


override DTC_FLAGS := \

	-Wno-avoid_unnecessary_addr_size \

	-Wno-graph_child_address \

	-Wno-unique_unit_address \

	-Wunique_unit_address_if_enabled
@@ -82,5 +81,8 @@ clean-files = $(shell find $(obj) \( -name '*.example.dts' -o \ 
dt_compatible_check: $(obj)/processed-schema.json

	$(Q)$(srctree)/scripts/dtc/dt-extract-compatibles $(srctree) | xargs dt-check-compatible -v -s $<



PHONY += dt_binding_check_one

dt_binding_check_one: $(obj)/.dt-binding.checked $(obj)/.yamllint.checked



PHONY += dt_binding_check

dt_binding_check: $(obj)/.dt-binding.checked $(obj)/.yamllint.checked $(CHK_DT_EXAMPLES)
 
dt_binding_check: dt_binding_check_one $(CHK_DT_EXAMPLES)

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

+6 −0
Original line number Diff line number Diff line
@@ -157,6 +157,12 @@ patternProperties: 
              - const: simple-bus

          - const: simple-bus



      "#interrupt-cells":

        const: 1



      interrupt-map: true

      interrupt-map-mask: true



    patternProperties:

      '^motherboard-bus@':

        type: object

Documentation/devicetree/bindings/arm/bcm/brcm,vulcan-soc.yaml

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/arm/bcm/brcm,vulcan-soc.yaml#

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



title: Broadcom Vulcan



maintainers:

  - Robert Richter <rrichter@marvell.com>



properties:

  $nodename:

    const: '/'

  compatible:

    items:

      - enum:

          - brcm,vulcan-eval

          - cavium,thunderx2-cn9900

      - const: brcm,vulcan-soc



additionalProperties: true



...

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

+8 −0
Original line number Diff line number Diff line
@@ -65,6 +65,11 @@ properties: 
      gpio-line-names:

        minItems: 8



    patternProperties:

      '-hog$':

        required:

          - gpio-hog



    required:

      - compatible

      - gpio-controller
@@ -87,6 +92,9 @@ properties: 
      - compatible

      - "#reset-cells"



  power:

    $ref: /schemas/power/raspberrypi,bcm2835-power.yaml#



  pwm:

    type: object

    additionalProperties: false