Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Pull Devicetree updates from Rob Herring:

 - DT binding schema examples are now validated against the schemas.
   Various examples are fixed due to that.

 - Sync dtc with upstream version v1.5.0-30-g702c1b6c0e73

 - Initial schemas for networking bindings. This includes ethernet, phy
   and mdio common bindings with several Allwinner and stmmac converted
   to the schema.

 - Conversion of more Arm top-level SoC/board bindings to DT schema

 - Conversion of PSCI binding to DT schema

 - Rework Arm CPU schema to coexist with other CPU schemas

 - Add a bunch of missing vendor prefixes and new ones for SoChip,
   Sipeed, Kontron, B&R Industrial Automation GmbH, and Espressif

 - Add Mediatek UART RX wakeup support to binding

 - Add reset to ST UART binding

 - Remove some Linuxisms from the endianness common-properties.txt
   binding

 - Make the flattened DT read-only after init

 - Ignore disabled reserved memory nodes

 - Clean-up some dead code in FDT functions

* tag 'devicetree-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (56 commits)
  dt-bindings: vendor-prefixes: add Sipeed
  dt-bindings: vendor-prefixes: add SoChip
  dt-bindings: 83xx-512x-pci: Drop cell-index property
  dt-bindings: serial: add documentation for Rx in-band wakeup support
  dt-bindings: arm: Convert RDA Micro board/soc bindings to json-schema
  of: unittest: simplify getting the adapter of a client
  of/fdt: pass early_init_dt_reserve_memory_arch() with bool type nomap
  of/platform: Drop superfluous cast in of_device_make_bus_id()
  dt-bindings: usb: ehci: Fix example warnings
  dt-bindings: net: Use phy-mode instead of phy-connection-type
  dt-bindings: simple-framebuffer: Add requirement for pipelines
  dt-bindings: display: Fix simple-framebuffer example
  dt-bindings: net: mdio: Add child nodes
  dt-bindings: net: mdio: Add address and size cells
  dt-bindings: net: mdio: Add a nodename pattern
  dt-bindings: mtd: sunxi-nand: Drop 'maxItems' from child 'reg' property
  dt-bindings: arm: Limit cpus schema to only check Arm 'cpu' nodes
  dt-bindings: backlight: lm3630a: correct schema validation
  dt-bindings: net: dwmac: Deprecate the PHY reset properties
  dt-bindings: net: sun8i-emac: Convert the binding to a schemas
  ...
parents 8931084c f59d2611

Documentation/arm64/booting.rst

+1 −1
Original line number Original line Diff line number Diff line
@@ -284,7 +284,7 @@ following manner: 
  processors") to bring CPUs into the kernel.

  processors") to bring CPUs into the kernel.





  The device tree should contain a 'psci' node, as described in

  The device tree should contain a 'psci' node, as described in

  Documentation/devicetree/bindings/arm/psci.txt.

  Documentation/devicetree/bindings/arm/psci.yaml.





- Secondary CPU general-purpose register settings

- Secondary CPU general-purpose register settings

  x0 = 0 (reserved for future use)

  x0 = 0 (reserved for future use)

Documentation/devicetree/bindings/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ DT_DOCS = $(shell \ 
DT_SCHEMA_FILES ?= $(addprefix $(src)/,$(DT_DOCS))

DT_SCHEMA_FILES ?= $(addprefix $(src)/,$(DT_DOCS))





extra-y += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES))

extra-y += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES))

extra-y += $(patsubst $(src)/%.yaml,%.example.dtb, $(DT_SCHEMA_FILES))

extra-y += $(patsubst $(src)/%.yaml,%.example.dt.yaml, $(DT_SCHEMA_FILES))





$(obj)/$(DT_TMP_SCHEMA): $(DT_SCHEMA_FILES) FORCE

$(obj)/$(DT_TMP_SCHEMA): $(DT_SCHEMA_FILES) FORCE

	$(call if_changed,mk_schema)
 
	$(call if_changed,mk_schema)

Documentation/devicetree/bindings/arm/al,alpine.txt

deleted100644 → 0
+0 −16
Original line number Original line Diff line number Diff line 
Annapurna Labs Alpine Platform Device Tree Bindings

---------------------------------------------------------------



Boards in the Alpine family shall have the following properties:



* Required root node properties:

compatible: must contain "al,alpine"



* Example:



/ {

	model = "Annapurna Labs Alpine Dev Board";

	compatible = "al,alpine";



	...

}

Documentation/devicetree/bindings/arm/al,alpine.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/arm/al,alpine.yaml#

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



title: Annapurna Labs Alpine Platform Device Tree Bindings



maintainers:

  - Tsahee Zidenberg <tsahee@annapurnalabs.com>

  - Antoine Tenart <antoine.tenart@bootlin.com>



properties:

  compatible:

    items:

      - const: al,alpine

  model:

    items:

      - const: "Annapurna Labs Alpine Dev Board"



...

Documentation/devicetree/bindings/arm/arm-boards

+1 −1
Original line number Original line Diff line number Diff line
@@ -197,7 +197,7 @@ Required nodes: 
The description for the board must include:

The description for the board must include:

   - a "psci" node describing the boot method used for the secondary CPUs.

   - a "psci" node describing the boot method used for the secondary CPUs.

     A detailed description of the bindings used for "psci" nodes is present

     A detailed description of the bindings used for "psci" nodes is present

     in the psci.txt file.

     in the psci.yaml file.

   - a "cpus" node describing the available cores and their associated

   - a "cpus" node describing the available cores and their associated

     "enable-method"s. For more details see cpus.txt file.

     "enable-method"s. For more details see cpus.txt file.