Skip to content

Commit 69f2970

Browse files
committed
Merge tag 'devicetree-for-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree updates from Rob Herring: - Add bindings for arm,armv7m-nvic, fsl,icoll, fsl,imx23-digctl, Xilinx INTC, Analog Devices ADT7411, and a bunch of trivial hwmon devices - Convert fsl,vf610-mscm-ir, fsl,dsu, via,vt8500-timer, nxp,isp1301, Marvell Armada NETA and BM, apm,xgene1-msi, fsl,mpic-msi, himax,hx8357d, and sitronix,st7586 bindings to DT schema format - Fixes for some display bindings - More indentation clean-ups in examples - Add more guidelines and clarifications on writing bindings * tag 'devicetree-for-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (31 commits) dt-bindings: Correct indentation and style in DTS example dt-bindings: display: mediatek,dp: Allow DisplayPort AUX bus dt-bindings: fsl: convert fsl,vf610-mscm-ir.txt to yaml format dt-bindings: interrupt-controller: Add fsl,icoll.yaml dt-bindings: interrupt-controller: Add missing Xilinx INTC binding dt-bindings: display: sprd,sharkl3-dsi-host: Fix missing clocks constraints dt-bindings: display: sprd,sharkl3-dpu: Fix missing clocks constraints dt-bindings: display: imx: convert fsl,dcu.txt to yaml format dt-bindings: timer: via,vt8500-timer: Convert to YAML dt-bindings: net: Convert Marvell Armada NETA and BM to DT schema dt-bindings: trivial-devices: Add undocumented hwmon devices dt-bindings: interrupt-controller: Convert apm,xgene1-msi to DT schema dt-bindings: gpu: mali-bifrost: Add Allwinner A523 compatible docs: dt: writing-schema: Document preferred order of properties docs: dt: writing-bindings: Document discouraged instance IDs docs: dt: writing-bindings: Document compatible and filename naming docs: dt: submitting-patches: Avoid 'YAML' in the subject and add an example MAINTAINERS: adjust file entry in INTEL STRATIX10 FIRMWARE DRIVERS docs: dt: writing-bindings: Consistently use single-whitespace docs: dt: writing-bindings: Express better expectations of "specific" ...
2 parents 137177a + 0121898 commit 69f2970

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1353
-798
lines changed

Documentation/devicetree/bindings/arm/arm,trace-buffer-extension.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ additionalProperties: false
4141
examples:
4242

4343
- |
44-
#include <dt-bindings/interrupt-controller/arm-gic.h>
44+
#include <dt-bindings/interrupt-controller/arm-gic.h>
4545
46-
trbe {
47-
compatible = "arm,trace-buffer-extension";
48-
interrupts = <GIC_PPI 15 IRQ_TYPE_LEVEL_HIGH>;
49-
};
46+
trbe {
47+
compatible = "arm,trace-buffer-extension";
48+
interrupts = <GIC_PPI 15 IRQ_TYPE_LEVEL_HIGH>;
49+
};
5050
...

Documentation/devicetree/bindings/arm/freescale/fsl,vf610-mscm-ir.txt

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

Documentation/devicetree/bindings/arm/stm32/st,mlahb.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@ unevaluatedProperties: false
5555
examples:
5656
- |
5757
ahb {
58-
compatible = "st,mlahb", "simple-bus";
59-
#address-cells = <1>;
60-
#size-cells = <1>;
61-
ranges;
62-
dma-ranges = <0x00000000 0x38000000 0x10000>,
63-
<0x10000000 0x10000000 0x60000>,
64-
<0x30000000 0x30000000 0x60000>;
58+
compatible = "st,mlahb", "simple-bus";
59+
#address-cells = <1>;
60+
#size-cells = <1>;
61+
ranges;
62+
dma-ranges = <0x00000000 0x38000000 0x10000>,
63+
<0x10000000 0x10000000 0x60000>,
64+
<0x30000000 0x30000000 0x60000>;
6565
66-
m4_rproc: m4@10000000 {
67-
reg = <0x10000000 0x40000>;
68-
};
66+
m4_rproc: m4@10000000 {
67+
reg = <0x10000000 0x40000>;
68+
};
6969
};
7070
7171
...

Documentation/devicetree/bindings/display/arm,pl11x.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ properties:
7878
If not present, the memory interface is fast enough to handle all
7979
possible video modes.
8080

81+
resets:
82+
maxItems: 1
83+
8184
port:
8285
$ref: /schemas/graph.yaml#/$defs/port-base
8386
additionalProperties: false

Documentation/devicetree/bindings/display/fsl,dcu.txt

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

Documentation/devicetree/bindings/display/fsl,lcdif.yaml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,23 @@ properties:
7171
$ref: /schemas/graph.yaml#/properties/port
7272
description: The LCDIF output port
7373

74+
display:
75+
$ref: /schemas/types.yaml#/definitions/phandle
76+
description: phandle to display panel
77+
deprecated: true
78+
79+
display0:
80+
$ref: panel/panel-common.yaml#
81+
deprecated: true
82+
83+
lcd-supply:
84+
deprecated: true
85+
7486
required:
7587
- compatible
7688
- reg
7789
- clocks
7890
- interrupts
79-
- port
8091

8192
additionalProperties: false
8293

@@ -175,6 +186,12 @@ allOf:
175186
properties:
176187
dmas: false
177188
dma-names: false
189+
display: false
190+
display0: false
191+
lcd-supply: false
192+
193+
required:
194+
- port
178195

179196
examples:
180197
- |
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/fsl,ls1021a-dcu.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Freescale DCU DRM Driver
8+
9+
maintainers:
10+
- Frank Li <[email protected]>
11+
12+
properties:
13+
compatible:
14+
enum:
15+
- fsl,ls1021a-dcu
16+
- fsl,vf610-dcu
17+
18+
reg:
19+
maxItems: 1
20+
21+
interrupts:
22+
maxItems: 1
23+
24+
clocks:
25+
maxItems: 2
26+
27+
clock-names:
28+
items:
29+
- const: dcu
30+
- const: pix
31+
32+
big-endian: true
33+
34+
port:
35+
$ref: /schemas/graph.yaml#/$defs/port-base
36+
unevaluatedProperties: false
37+
description: Video port for the panel output
38+
39+
properties:
40+
endpoint:
41+
$ref: /schemas/media/video-interfaces.yaml#
42+
unevaluatedProperties: false
43+
44+
fsl,tcon:
45+
$ref: /schemas/types.yaml#/definitions/phandle
46+
description: The phandle to the timing controller node.
47+
48+
required:
49+
- compatible
50+
- reg
51+
- clocks
52+
- clock-names
53+
54+
additionalProperties: false
55+
56+
examples:
57+
- |
58+
display-controller@2ce0000 {
59+
compatible = "fsl,ls1021a-dcu";
60+
reg = <0x2ce0000 0x10000>;
61+
clocks = <&platform_clk 0>, <&platform_clk 0>;
62+
clock-names = "dcu", "pix";
63+
big-endian;
64+
fsl,tcon = <&tcon>;
65+
66+
port {
67+
endpoint {
68+
remote-endpoint = <&panel_out>;
69+
};
70+
};
71+
};
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/himax,hx8357.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Himax HX8357D display panel
8+
9+
description:
10+
Display panels using a Himax HX8357D controller in SPI
11+
mode, such as the Adafruit 3.5" TFT for Raspberry Pi.
12+
13+
maintainers:
14+
- Frank Li <[email protected]>
15+
16+
properties:
17+
compatible:
18+
oneOf:
19+
- items:
20+
- enum:
21+
- adafruit,yx350hv15
22+
- himax,hx8357b
23+
- const: himax,hx8357
24+
- items:
25+
- enum:
26+
- himax,hx8369a
27+
- const: himax,hx8369
28+
29+
reg:
30+
maxItems: 1
31+
32+
dc-gpios:
33+
maxItems: 1
34+
description: D/C pin
35+
36+
rotation:
37+
enum: [0, 90, 180, 270]
38+
39+
backlight:
40+
description:
41+
phandle of the backlight device attached to the panel
42+
43+
im-gpios:
44+
maxItems: 3
45+
46+
reset-gpios:
47+
maxItems: 1
48+
49+
spi-cpha: true
50+
51+
spi-cpol: true
52+
53+
required:
54+
- compatible
55+
- reg
56+
57+
allOf:
58+
- $ref: /schemas/spi/spi-peripheral-props.yaml#
59+
60+
unevaluatedProperties: false
61+
62+
examples:
63+
- |
64+
#include <dt-bindings/gpio/gpio.h>
65+
66+
spi {
67+
#address-cells = <1>;
68+
#size-cells = <0>;
69+
70+
display@0 {
71+
compatible = "adafruit,yx350hv15", "himax,hx8357";
72+
reg = <0>;
73+
spi-max-frequency = <32000000>;
74+
dc-gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>;
75+
rotation = <90>;
76+
backlight = <&backlight>;
77+
};
78+
};

Documentation/devicetree/bindings/display/himax,hx8357d.txt

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

Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ properties:
4545
'#sound-dai-cells':
4646
const: 0
4747

48+
aux-bus:
49+
$ref: /schemas/display/dp-aux-bus.yaml#
50+
4851
ports:
4952
$ref: /schemas/graph.yaml#/properties/ports
5053
properties:

0 commit comments

Comments
 (0)