Skip to content

Commit 62746f9

Browse files
torvaldstorvalds
committed
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 ...
2 parents f68e404 + e33dc2f commit 62746f9

23 files changed

+290
-262
lines changed

‎Documentation/devicetree/bindings/Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@ find_cmd = find $(srctree)/$(src) \( -name '*.yaml' ! \
2727
-name '*.example.dt.yaml' \)
2828

2929
quiet_cmd_yamllint = LINT $(src)
30-
cmd_yamllint = $(find_cmd) | \
31-
xargs $(DT_SCHEMA_LINT) -f parsable -c $(srctree)/$(src)/.yamllint
30+
cmd_yamllint = ($(find_cmd) | \
31+
xargs $(DT_SCHEMA_LINT) -f parsable -c $(srctree)/$(src)/.yamllint) || true
3232

3333
quiet_cmd_chk_bindings = CHKDT $@
34-
cmd_chk_bindings = $(find_cmd) | \
35-
xargs -n200 -P$$(nproc) $(DT_DOC_CHECKER) -u $(srctree)/$(src)
34+
cmd_chk_bindings = ($(find_cmd) | \
35+
xargs -n200 -P$$(nproc) $(DT_DOC_CHECKER) -u $(srctree)/$(src)) || true
3636

3737
quiet_cmd_mk_schema = SCHEMA $@
3838
cmd_mk_schema = f=$$(mktemp) ; \
3939
$(if $(DT_MK_SCHEMA_FLAGS), \
40-
echo $(real-prereqs), \
40+
printf '%s\n' $(real-prereqs), \
4141
$(find_cmd)) > $$f ; \
4242
$(DT_MK_SCHEMA) -j $(DT_MK_SCHEMA_FLAGS) @$$f > $@ ; \
4343
rm -f $$f

‎Documentation/devicetree/bindings/arm/picoxcell.txt‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎Documentation/devicetree/bindings/arm/vt8500.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,5 @@ properties:
2121
- wm,wm8650
2222
- wm,wm8750
2323
- wm,wm8850
24-
25-
additionalProperties: true
2624

25+
additionalProperties: true

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

Lines changed: 0 additions & 21 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Required properties:
1212
example:
1313

1414
display-subsystem {
15-
compatible = "fsl,display-subsystem";
15+
compatible = "fsl,imx-display-subsystem";
1616
ports = <&ipu_di0>;
1717
};
1818

‎Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,23 @@ properties:
5252
"#cooling-cells":
5353
const: 2
5454

55+
dynamic-power-coefficient:
56+
$ref: '/schemas/types.yaml#/definitions/uint32'
57+
description:
58+
A u32 value that represents the running time dynamic
59+
power coefficient in units of uW/MHz/V^2. The
60+
coefficient can either be calculated from power
61+
measurements or derived by analysis.
62+
63+
The dynamic power consumption of the GPU is
64+
proportional to the square of the Voltage (V) and
65+
the clock frequency (f). The coefficient is used to
66+
calculate the dynamic power as below -
67+
68+
Pdyn = dynamic-power-coefficient * V^2 * f
69+
70+
where voltage is in V, frequency is in MHz.
71+
5572
required:
5673
- compatible
5774
- reg

‎Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,23 @@ properties:
9090

9191
dma-coherent: true
9292

93+
dynamic-power-coefficient:
94+
$ref: '/schemas/types.yaml#/definitions/uint32'
95+
description:
96+
A u32 value that represents the running time dynamic
97+
power coefficient in units of uW/MHz/V^2. The
98+
coefficient can either be calculated from power
99+
measurements or derived by analysis.
100+
101+
The dynamic power consumption of the GPU is
102+
proportional to the square of the Voltage (V) and
103+
the clock frequency (f). The coefficient is used to
104+
calculate the dynamic power as below -
105+
106+
Pdyn = dynamic-power-coefficient * V^2 * f
107+
108+
where voltage is in V, frequency is in MHz.
109+
93110
required:
94111
- compatible
95112
- reg

‎Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ Example for GV11B:
9797

9898
gpu@17000000 {
9999
compatible = "nvidia,gv11b";
100-
reg = <0x17000000 0x10000000>,
101-
<0x18000000 0x10000000>;
100+
reg = <0x17000000 0x1000000>,
101+
<0x18000000 0x1000000>;
102102
interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>,
103103
<GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
104104
interrupt-names = "stall", "nonstall";

‎Documentation/devicetree/bindings/i2c/i2c-gate.txt‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎Documentation/devicetree/bindings/i2c/i2c-gate.yaml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/i2c/i2c-gate.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Common i2c gate properties
8+
9+
maintainers:
10+
- Peter Rosin <peda@axentia.se>
11+
12+
description: |
13+
An i2c gate is useful to e.g. reduce the digital noise for RF tuners connected
14+
to the i2c bus. Gates are similar to arbitrators in that you need to perform
15+
some kind of operation to access the i2c bus past the arbitrator/gate, but
16+
there are no competing masters to consider for gates and therefore there is
17+
no arbitration happening for gates.
18+
19+
allOf:
20+
- $ref: /schemas/i2c/i2c-controller.yaml
21+
22+
properties:
23+
$nodename:
24+
const: i2c-gate
25+
26+
additionalProperties: true
27+
28+
examples:
29+
- |
30+
i2c-gate {
31+
#address-cells = <1>;
32+
#size-cells = <0>;
33+
ak8975@c {
34+
compatible = "ak,ak8975";
35+
reg = <0x0c>;
36+
};
37+
};
38+
...
39+

0 commit comments

Comments
 (0)