Skip to content

Commit

Permalink
Merge tag 'devicetree-for-5.11' 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:

 - 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
  ...
  • Loading branch information
Linus Torvalds committed Dec 16, 2020
2 parents f68e404 + e33dc2f commit 62746f9
Show file tree
Hide file tree
Showing 23 changed files with 290 additions and 262 deletions.
10 changes: 5 additions & 5 deletions Documentation/devicetree/bindings/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 0 additions & 24 deletions Documentation/devicetree/bindings/arm/picoxcell.txt

This file was deleted.

3 changes: 1 addition & 2 deletions Documentation/devicetree/bindings/arm/vt8500.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,5 @@ properties:
- wm,wm8650
- wm,wm8750
- wm,wm8850

additionalProperties: true

additionalProperties: true
21 changes: 0 additions & 21 deletions Documentation/devicetree/bindings/crypto/picochip-spacc.txt

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Required properties:
example:

display-subsystem {
compatible = "fsl,display-subsystem";
compatible = "fsl,imx-display-subsystem";
ports = <&ipu_di0>;
};

Expand Down
17 changes: 17 additions & 0 deletions Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,23 @@ properties:
"#cooling-cells":
const: 2

dynamic-power-coefficient:
$ref: '/schemas/types.yaml#/definitions/uint32'
description:
A u32 value that represents the running time dynamic
power coefficient in units of uW/MHz/V^2. The
coefficient can either be calculated from power
measurements or derived by analysis.

The dynamic power consumption of the GPU is
proportional to the square of the Voltage (V) and
the clock frequency (f). The coefficient is used to
calculate the dynamic power as below -

Pdyn = dynamic-power-coefficient * V^2 * f

where voltage is in V, frequency is in MHz.

required:
- compatible
- reg
Expand Down
17 changes: 17 additions & 0 deletions Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,23 @@ properties:

dma-coherent: true

dynamic-power-coefficient:
$ref: '/schemas/types.yaml#/definitions/uint32'
description:
A u32 value that represents the running time dynamic
power coefficient in units of uW/MHz/V^2. The
coefficient can either be calculated from power
measurements or derived by analysis.

The dynamic power consumption of the GPU is
proportional to the square of the Voltage (V) and
the clock frequency (f). The coefficient is used to
calculate the dynamic power as below -

Pdyn = dynamic-power-coefficient * V^2 * f

where voltage is in V, frequency is in MHz.

required:
- compatible
- reg
Expand Down
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ Example for GV11B:

gpu@17000000 {
compatible = "nvidia,gv11b";
reg = <0x17000000 0x10000000>,
<0x18000000 0x10000000>;
reg = <0x17000000 0x1000000>,
<0x18000000 0x1000000>;
interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "stall", "nonstall";
Expand Down
41 changes: 0 additions & 41 deletions Documentation/devicetree/bindings/i2c/i2c-gate.txt

This file was deleted.

39 changes: 39 additions & 0 deletions Documentation/devicetree/bindings/i2c/i2c-gate.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/i2c/i2c-gate.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Common i2c gate properties

maintainers:
- Peter Rosin <peda@axentia.se>

description: |
An i2c gate is useful to e.g. reduce the digital noise for RF tuners connected
to the i2c bus. Gates are similar to arbitrators in that you need to perform
some kind of operation to access the i2c bus past the arbitrator/gate, but
there are no competing masters to consider for gates and therefore there is
no arbitration happening for gates.
allOf:
- $ref: /schemas/i2c/i2c-controller.yaml

properties:
$nodename:
const: i2c-gate

additionalProperties: true

examples:
- |
i2c-gate {
#address-cells = <1>;
#size-cells = <0>;
ak8975@c {
compatible = "ak,ak8975";
reg = <0x0c>;
};
};
...

Original file line number Diff line number Diff line change
Expand Up @@ -101,26 +101,20 @@ unevaluatedProperties: false
required:
- compatible
- reg
- "#address-cells"
- "#size-cells"
- interrupts

examples:
- |
i2c@f0000 {
compatible = "snps,designware-i2c";
reg = <0xf0000 0x1000>;
#address-cells = <1>;
#size-cells = <0>;
interrupts = <11>;
clock-frequency = <400000>;
};
- |
i2c@1120000 {
compatible = "snps,designware-i2c";
reg = <0x1120000 0x1000>;
#address-cells = <1>;
#size-cells = <0>;
interrupts = <12 1>;
clock-frequency = <400000>;
i2c-sda-hold-time-ns = <300>;
Expand Down Expand Up @@ -148,8 +142,6 @@ examples:
reg = <0x100400 0x100>, <0x198 0x8>;
pinctrl-0 = <&i2c_pins>;
pinctrl-names = "default";
#address-cells = <1>;
#size-cells = <0>;
interrupts = <8>;
clocks = <&ahb_clk>;
};
Expand Down
6 changes: 3 additions & 3 deletions Documentation/devicetree/bindings/mfd/st,stm32-timers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ additionalProperties: false
examples:
- |
#include <dt-bindings/clock/stm32mp1-clks.h>
timers2: timers@40000000 {
timers2: timer@40000000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "st,stm32-timers";
Expand All @@ -149,9 +149,9 @@ examples:
#pwm-cells = <3>;
st,breakinput = <0 1 5>;
};
timer@0 {
timer@1 {
compatible = "st,stm32-timer-trigger";
reg = <0>;
reg = <1>;
};
counter {
compatible = "st,stm32-timer-counter";
Expand Down
11 changes: 0 additions & 11 deletions Documentation/devicetree/bindings/misc/fsl,dpaa2-console.txt

This file was deleted.

25 changes: 25 additions & 0 deletions Documentation/devicetree/bindings/misc/fsl,dpaa2-console.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
# Copyright 2020 NXP
%YAML 1.2
---
$id: http://devicetree.org/schemas/misc/fsl,dpaa2-console.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: DPAA2 console support

maintainers:
- Laurentiu Tudor <laurentiu.tudor@nxp.com>

properties:
compatible:
const: "fsl,dpaa2-console"

reg:
description: A standard property. Specifies the region where the MCFBA
(MC firmware base address) register can be found.

required:
- compatible
- reg

additionalProperties: false
Loading

0 comments on commit 62746f9

Please sign in to comment.