Skip to content

Commit

Permalink
Merge tag 'devicetree-for-6.1' of git://git.kernel.org/pub/scm/linux/…
Browse files Browse the repository at this point in the history
…kernel/git/robh/linux

Pull devicetree updates from Rob Herring:
 "DT core:

   - Fix node refcounting in of_find_last_cache_level()

   - Constify device_node in of_device_compatible_match()

   - Fix 'dma-ranges' handling in bus controller nodes

   - Fix handling of initrd start > end

   - Improve error reporting in of_irq_init()

   - Taint kernel on DT unittest running

   - Use strscpy instead of strlcpy

   - Add a build target, dt_compatible_check, to check for compatible
     strings used in kernel sources against compatible strings in DT
     schemas.

   - Handle DT_SCHEMA_FILES changes when rebuilding

  DT bindings:

   - LED bindings for MT6370 PMIC

   - Convert Mediatek mtk-gce mailbox, MIPS CPU interrupt controller,
     mt7621 I2C, virtio,pci-iommu, nxp,tda998x, QCom fastrpc, qcom,pdc,
     and arm,versatile-sysreg to DT schema format

   - Add nvmem cells to u-boot,env schema

   - Add more LED_COLOR_ID definitions

   - Require 'opp-table' uses to be a node

   - Various schema fixes to match QEMU 'virt' DT usage

   - Tree wide dropping of redundant 'Device Tree Binding' in schema
     titles

   - More (unevaluated|additional)Properties fixes in schema child nodes

   - Drop various redundant minItems equal to maxItems"

* tag 'devicetree-for-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (62 commits)
  of: base: Shift refcount decrement in of_find_last_cache_level()
  dt-bindings: leds: Add MediaTek MT6370 flashlight
  dt-bindings: leds: mt6370: Add MediaTek MT6370 current sink type LED indicator
  dt-bindings: mailbox: Convert mtk-gce to DT schema
  of: base: make of_device_compatible_match() accept const device node
  of: Fix "dma-ranges" handling for bus controllers
  of: fdt: Remove unused struct fdt_scan_status
  dt-bindings: display: st,stm32-dsi: Handle data-lanes in DSI port node
  dt-bindings: timer: Add power-domains for TI timer-dm on K3
  dt: Add a check for undocumented compatible strings in kernel
  kbuild: take into account DT_SCHEMA_FILES changes while checking dtbs
  dt-bindings: interrupt-controller: migrate MIPS CPU interrupt controller text bindings to YAML
  dt-bindings: i2c: migrate mt7621 text bindings to YAML
  dt-bindings: power: gpcv2: correct patternProperties
  dt-bindings: virtio: Convert virtio,pci-iommu to DT schema
  dt-bindings: timer: arm,arch_timer: Allow dual compatible string
  dt-bindings: arm: cpus: Add kryo240 compatible
  dt-bindings: display: bridge: nxp,tda998x: Convert to json-schema
  dt-bindings: nvmem: u-boot,env: add basic NVMEM cells
  dt-bindings: remoteproc: qcom,adsp: enforce smd-edge schema
  ...
  • Loading branch information
Linus Torvalds committed Oct 10, 2022
2 parents ada3bfb + 7a7f585 commit 706eaca
Show file tree
Hide file tree
Showing 445 changed files with 1,467 additions and 993 deletions.
3 changes: 3 additions & 0 deletions Documentation/devicetree/bindings/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,6 @@ always-$(CHECK_DT_BINDING) += $(patsubst $(srctree)/$(src)/%.yaml,%.example.dtb,
# build artifacts here before they are processed by scripts/Makefile.clean
clean-files = $(shell find $(obj) \( -name '*.example.dts' -o \
-name '*.example.dtb' \) -delete 2>/dev/null)

dt_compatible_check: $(obj)/processed-schema.json
$(Q)$(srctree)/scripts/dtc/dt-extract-compatibles $(srctree) | xargs dt-check-compatible -v -s $<
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/actions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/actions.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Actions Semi platforms device tree bindings
title: Actions Semi platforms

maintainers:
- Andreas Färber <afaerber@suse.de>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/airoha.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/airoha.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Airoha SoC based Platforms Device Tree Bindings
title: Airoha SoC based Platforms

maintainers:
- Felix Fietkau <nbd@nbd.name>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/altera.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/altera.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Altera's SoCFPGA platform device tree bindings
title: Altera's SoCFPGA platform

maintainers:
- Dinh Nguyen <dinguyen@kernel.org>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/amazon,al.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/amazon,al.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Amazon's Annapurna Labs Alpine Platform Device Tree Bindings
title: Amazon's Annapurna Labs Alpine Platform

maintainers:
- Hanna Hawa <hhhawa@amazon.com>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/amlogic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/amlogic.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Amlogic MesonX device tree bindings
title: Amlogic MesonX

maintainers:
- Kevin Hilman <khilman@baylibre.com>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/apple.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/apple.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Apple ARM Machine Device Tree Bindings
title: Apple ARM Machine

maintainers:
- Hector Martin <marcan@marcan.st>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/arm,cci-400.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/arm,cci-400.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: ARM CCI Cache Coherent Interconnect Device Tree Binding
title: ARM CCI Cache Coherent Interconnect

maintainers:
- Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/arm,corstone1000.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: ARM Corstone1000 Device Tree Bindings
title: ARM Corstone1000

maintainers:
- Vishnu Banavath <vishnu.banavath@arm.com>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/arm,integrator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/arm,integrator.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: ARM Integrator Boards Device Tree Bindings
title: ARM Integrator Boards

maintainers:
- Linus Walleij <linus.walleij@linaro.org>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/arm,realview.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/arm,realview.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: ARM RealView Boards Device Tree Bindings
title: ARM RealView Boards

maintainers:
- Linus Walleij <linus.walleij@linaro.org>
Expand Down
35 changes: 35 additions & 0 deletions Documentation/devicetree/bindings/arm/arm,versatile-sysreg.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# SPDX-License-Identifier: (GPL-2.0-only or BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/arm/arm,versatile-sysreg.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Arm Versatile system registers

maintainers:
- Linus Walleij <linus.walleij@linaro.org>

description:
This is a system control registers block, providing multiple low level
platform functions like board detection and identification, software
interrupt generation, MMC and NOR Flash control, etc.

properties:
compatible:
items:
- const: arm,versatile-sysreg
- const: syscon
- const: simple-mfd

reg:
maxItems: 1

panel:
type: object

required:
- compatible
- reg

additionalProperties: false
...
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/arm,versatile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/arm,versatile.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: ARM Versatile Boards Device Tree Bindings
title: ARM Versatile Boards

maintainers:
- Linus Walleij <linus.walleij@linaro.org>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/arm,vexpress-juno.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: ARM Versatile Express and Juno Boards Device Tree Bindings
title: ARM Versatile Express and Juno Boards

maintainers:
- Sudeep Holla <sudeep.holla@arm.com>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/atmel-at91.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/atmel-at91.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Atmel AT91 device tree bindings.
title: Atmel AT91.

maintainers:
- Alexandre Belloni <alexandre.belloni@bootlin.com>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/axxia.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/axxia.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Axxia AXM55xx device tree bindings
title: Axxia AXM55xx

maintainers:
- Anders Berg <anders.berg@lsi.com>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/bitmain.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/bitmain.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Bitmain platform device tree bindings
title: Bitmain platform

maintainers:
- Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/calxeda.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/calxeda.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Calxeda Platforms Device Tree Bindings
title: Calxeda Platforms

maintainers:
- Rob Herring <robh@kernel.org>
Expand Down
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/arm/cpus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ properties:
- nvidia,tegra194-carmel
- qcom,krait
- qcom,kryo
- qcom,kryo240
- qcom,kryo250
- qcom,kryo260
- qcom,kryo280
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/digicolor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/digicolor.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Conexant Digicolor Platforms Device Tree Bindings
title: Conexant Digicolor Platforms

maintainers:
- Baruch Siach <baruch@tkos.co.il>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/fsl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/fsl.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Freescale i.MX Platforms Device Tree Bindings
title: Freescale i.MX Platforms

maintainers:
- Shawn Guo <shawnguo@kernel.org>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/intel,keembay.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/intel,keembay.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Keem Bay platform device tree bindings
title: Keem Bay platform

maintainers:
- Paul J. Murphy <paul.j.murphy@intel.com>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/intel,socfpga.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/intel,socfpga.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Intel SoCFPGA platform device tree bindings
title: Intel SoCFPGA platform

maintainers:
- Dinh Nguyen <dinguyen@kernel.org>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/intel-ixp4xx.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Intel IXP4xx Device Tree Bindings
title: Intel IXP4xx

maintainers:
- Linus Walleij <linus.walleij@linaro.org>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/mediatek.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/mediatek.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: MediaTek SoC based Platforms Device Tree Bindings
title: MediaTek SoC based Platforms

maintainers:
- Sean Wang <sean.wang@mediatek.com>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ properties:
description:
Using mailbox to communicate with GCE, it should have this
property and list of phandle, mailbox specifiers. See
Documentation/devicetree/bindings/mailbox/mtk-gce.txt for details.
Documentation/devicetree/bindings/mailbox/mediatek,gce-mailbox.yaml
for details.
$ref: /schemas/types.yaml#/definitions/phandle-array

mediatek,gce-client-reg:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/microchip,sparx5.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Microchip Sparx5 Boards Device Tree Bindings
title: Microchip Sparx5 Boards

maintainers:
- Lars Povlsen <lars.povlsen@microchip.com>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/moxart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/moxart.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: MOXA ART device tree bindings
title: MOXA ART

maintainers:
- Jonas Jensen <jonas.jensen@gmail.com>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: "http://devicetree.org/schemas/arm/nvidia,tegra194-ccplex.yaml#"
$schema: "http://devicetree.org/meta-schemas/core.yaml#"

title: NVIDIA Tegra194 CPU Complex device tree bindings
title: NVIDIA Tegra194 CPU Complex

maintainers:
- Thierry Reding <thierry.reding@gmail.com>
Expand Down
11 changes: 3 additions & 8 deletions Documentation/devicetree/bindings/arm/psci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,31 +41,26 @@ properties:
For implementations complying to PSCI versions prior to 0.2.
const: arm,psci

- description:
For implementations complying to PSCI 0.2.
const: arm,psci-0.2

- description:
For implementations complying to PSCI 0.2.
Function IDs are not required and should be ignored by an OS with
PSCI 0.2 support, but are permitted to be present for compatibility
with existing software when "arm,psci" is later in the compatible
list.
minItems: 1
items:
- const: arm,psci-0.2
- const: arm,psci

- description:
For implementations complying to PSCI 1.0.
const: arm,psci-1.0

- description:
For implementations complying to PSCI 1.0.
PSCI 1.0 is backward compatible with PSCI 0.2 with minor
specification updates, as defined in the PSCI specification[2].
minItems: 1
items:
- const: arm,psci-1.0
- const: arm,psci-0.2
- const: arm,psci

method:
description: The method of calling the PSCI firmware.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/qcom.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/qcom.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: QCOM device tree bindings
title: QCOM

maintainers:
- Bjorn Andersson <bjorn.andersson@linaro.org>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/rda.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/rda.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: RDA Micro platforms device tree bindings
title: RDA Micro platforms

maintainers:
- Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/realtek.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/realtek.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Realtek platforms device tree bindings
title: Realtek platforms

maintainers:
- Andreas Färber <afaerber@suse.de>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/renesas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/renesas.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Renesas SH-Mobile, R-Mobile, and R-Car Platform Device Tree Bindings
title: Renesas SH-Mobile, R-Mobile, and R-Car Platform

maintainers:
- Geert Uytterhoeven <geert+renesas@glider.be>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/rockchip.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/rockchip.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Rockchip platforms device tree bindings
title: Rockchip platforms

maintainers:
- Heiko Stuebner <heiko@sntech.de>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ properties:
description: |
should contain 3 regions: control register, revision register,
operation register, in this order.
minItems: 3
maxItems: 3

interrupts:
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/spear.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/spear.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: ST SPEAr Platforms Device Tree Bindings
title: ST SPEAr Platforms

maintainers:
- Viresh Kumar <vireshk@kernel.org>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/sti.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/arm/sti.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: ST STi Platforms Device Tree Bindings
title: ST STi Platforms

maintainers:
- Patrice Chotard <patrice.chotard@foss.st.com>
Expand Down
Loading

0 comments on commit 706eaca

Please sign in to comment.