Commit 62746f92 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull devicetree updates from Rob Herring:

 - Add vendor prefixes for bm, gpio-key, mentor, FII, and Ampere

 - Add ADP5585/ADP5589 and delta,q54sj108a2 to trivial-devices.yaml

 - Convert fixed-partitions, i2c-gate and fsl,dpaa2-console bindings to
   schemas

 - Drop PicoXcell bindings

 - Drop unused and undocumented 'pnx,timeout' property from LPC32xx

 - Add 'dynamic-power-coefficient' to Mali GPU bindings

 - Make 'make dt_binding_check' not error out on warnings

 - Various minor binding fixes

* tag 'devicetree-for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (22 commits)
  dt-bindings: mali-bifrost: Add dynamic-power-coefficient
  dt-bindings: mali-midgard: Add dynamic-power-coefficient
  dt-bindings: i2c: dw: cancel mandatory requirements for "#address-cells" and "#size-cells"
  dt-bindings: Remove PicoXcell bindings
  ARM: dts: lpc32xx: Remove unused and undocumented 'pnx,timeout'
  dt-bindings: mtd: convert "fixed-partitions" to the json-schema
  dt-bindings: vendor-prefixes: Add undocumented bm, gpio-key, and mentor prefixes
  dt-bindings: pci: rcar-pci-ep: Document missing interrupts property
  dt-bindings: vendor-prefixes: Add an entry for AmpereComputing.com
  dt-bindings: vendor-prefixes: correct the spelling of TQ-Systems GmbH
  dt-bindings: mfd: fix stm32 timers example
  dt-bindings: trivial-devices: Add delta,q54sj108a2
  dt-bindings:i2c:i2c-gate: txt to yaml conversion
  dt-bindings: add ADP5585/ADP5589 entries to trivial-devices
  dt-bindings: Correct GV11B GPU register sizes
  dt-bindings: vendor-prefixes: Add FII
  dt-bindings: Fix typo on the DesignWare IP reset bindings documentation
  dt-bindings: Fix error in 'make dtbs_check' when using DT_SCHEMA_FILES
  dt-bindings: arm: vt8500: remove redundant white-spaces
  dt-bindings: fsl-imx-drm: fix example compatible string
  ...
parents f68e4041 e33dc2f3

Documentation/devicetree/bindings/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -27,17 +27,17 @@ find_cmd = find $(srctree)/$(src) \( -name '*.yaml' ! \ 
		-name '*.example.dt.yaml' \)



quiet_cmd_yamllint = LINT    $(src)

      cmd_yamllint = $(find_cmd) | \

                     xargs $(DT_SCHEMA_LINT) -f parsable -c $(srctree)/$(src)/.yamllint

      cmd_yamllint = ($(find_cmd) | \

                     xargs $(DT_SCHEMA_LINT) -f parsable -c $(srctree)/$(src)/.yamllint) || true



quiet_cmd_chk_bindings = CHKDT   $@

      cmd_chk_bindings = $(find_cmd) | \

                         xargs -n200 -P$$(nproc) $(DT_DOC_CHECKER) -u $(srctree)/$(src)

      cmd_chk_bindings = ($(find_cmd) | \

                         xargs -n200 -P$$(nproc) $(DT_DOC_CHECKER) -u $(srctree)/$(src)) || true



quiet_cmd_mk_schema = SCHEMA  $@

      cmd_mk_schema = f=$$(mktemp) ; \

                      $(if $(DT_MK_SCHEMA_FLAGS), \

                           echo $(real-prereqs), \

                           printf '%s\n' $(real-prereqs), \

                           $(find_cmd)) > $$f ; \

                      $(DT_MK_SCHEMA) -j $(DT_MK_SCHEMA_FLAGS) @$$f > $@ ; \

		      rm -f $$f

Documentation/devicetree/bindings/arm/picoxcell.txt

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
Picochip picoXcell device tree bindings.

========================================



Required root node properties:

    - compatible:

	- "picochip,pc7302-pc3x3" : PC7302 development board with PC3X3 device.

	- "picochip,pc7302-pc3x2" : PC7302 development board with PC3X2 device.

	- "picochip,pc3x3" : picoXcell PC3X3 device based board.

	- "picochip,pc3x2" : picoXcell PC3X2 device based board.



Timers required properties:

    - compatible = "picochip,pc3x2-timer"

    - interrupts : The single IRQ line for the timer.

    - clock-freq : The frequency in HZ of the timer.

    - reg : The register bank for the timer.



Note: two timers are required - one for the scheduler clock and one for the

event tick/NOHZ.



VIC required properties:

    - compatible = "arm,pl192-vic".

    - interrupt-controller.

    - reg : The register bank for the device.

    - #interrupt-cells : Must be 1.

Documentation/devicetree/bindings/arm/vt8500.yaml

+1 −2
Original line number Diff line number Diff line
@@ -23,4 +23,3 @@ properties: 
          - wm,wm8850



additionalProperties: true

Documentation/devicetree/bindings/crypto/picochip-spacc.txt

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
Picochip picoXcell SPAcc (Security Protocol Accelerator) bindings



Picochip picoXcell devices contain crypto offload engines that may be used for

IPSEC and femtocell layer 2 ciphering.



Required properties:

  - compatible : "picochip,spacc-ipsec" for the IPSEC offload engine

    "picochip,spacc-l2" for the femtocell layer 2 ciphering engine.

  - reg : Offset and length of the register set for this device

  - interrupts : The interrupt line from the SPAcc.

  - ref-clock : The input clock that drives the SPAcc.



Example SPAcc node:



spacc@10000 {

	compatible = "picochip,spacc-ipsec";

	reg = <0x100000 0x10000>;

	interrupt-parent = <&vic0>;

	interrupts = <24>;

	ref-clock = <&ipsec_clk>, "ref";

};

Documentation/devicetree/bindings/display/imx/fsl-imx-drm.txt

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ Required properties: 
example:



display-subsystem {

	compatible = "fsl,display-subsystem";

	compatible = "fsl,imx-display-subsystem";

	ports = <&ipu_di0>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE