Skip to content

Commit 06f054b

Browse files
committed
Merge tag 'devicetree-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree updates from Rob Herring: "DT Bindings: - Convert samsung,exynos5-dp, atmel,lcdc, aspeed,ast2400-wdt bindings to schemas - Add bindings for Allwinner H616 NMI controller, Renesas r8a779g0 irqc, Renesas R-Car V4M TMU and CMT timers, Freescale S32G3 linflexuart, and Mediatek MT7988 XHCI - Add 'reg' constraints on DSI and SPI display panels - More dropping of unnecessary quotes in schemas - Use full paths rather than relative paths in schema $refs - Drop redundant storing of phandle for reserved memory DT Core: - Use scope based cleanups for kfree() and of_node_put() - Track interrupt-map and power-supplies for fw_devlink - Add buffer overflow check in of_modalias() - Add and use __of_prop_free() helper for freeing struct property" * tag 'devicetree-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (25 commits) of: property: Add fw_devlink support for interrupt-map property dt-bindings: display: panel: constrain 'reg' in DSI panels dt-bindings: display: panel: constrain 'reg' in SPI panels dt-bindings: display: samsung,ams495qa01: add missing SPI properties ref dt-bindings: Use full path to other schemas dt-bindings: PCI: qcom,pcie-sm8350: Drop redundant 'oneOf' sub-schema of: module: add buffer overflow check in of_modalias() dt-bindings: PCI: microchip: increase number of items in ranges property dt-bindings: Drop unnecessary quotes on keys dt-bindings: interrupt-controller: mediatek,mt6577-sysirq: Drop unnecessary quotes of: property: Use scope based cleanup on port_node of: reserved_mem: Remove the use of phandle from the reserved_mem APIs of: property: fw_devlink: Add support for "power-supplies" binding dt-bindings: watchdog: aspeed,ast2400-wdt: Convert to DT schema dt-bindings: irq: sun7i-nmi: Add binding for the H616 NMI controller dt-bindings: interrupt-controller: renesas,irqc: Add r8a779g0 support dt-bindings: timer: renesas,tmu: Add R-Car V4M support dt-bindings: timer: renesas,cmt: Add R-Car V4M support of: Use scope based of_node_put() cleanups of: Use scope based kfree() cleanups ...
2 parents 7ee332c + d976c6f commit 06f054b

File tree

99 files changed

+853
-588
lines changed

Some content is hidden

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

99 files changed

+853
-588
lines changed
Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/atmel,lcdc-display.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Microchip's LCDC Display
8+
9+
maintainers:
10+
- Nicolas Ferre <nicolas.ferre@microchip.com>
11+
- Dharma Balasubiramani <dharma.b@microchip.com>
12+
13+
description:
14+
The LCD Controller (LCDC) consists of logic for transferring LCD image data
15+
from an external display buffer to a TFT LCD panel. The LCDC has one display
16+
input buffer per layer that fetches pixels through the single bus host
17+
interface and a look-up table to allow palletized display configurations. The
18+
LCDC is programmable on a per layer basis, and supports different LCD
19+
resolutions, window sizes, image formats and pixel depths.
20+
21+
# We need a select here since this schema is applicable only for nodes with the
22+
# following properties
23+
24+
select:
25+
anyOf:
26+
- required: [ 'atmel,dmacon' ]
27+
- required: [ 'atmel,lcdcon2' ]
28+
- required: [ 'atmel,guard-time' ]
29+
30+
properties:
31+
atmel,dmacon:
32+
$ref: /schemas/types.yaml#/definitions/uint32
33+
description: dma controller configuration
34+
35+
atmel,lcdcon2:
36+
$ref: /schemas/types.yaml#/definitions/uint32
37+
description: lcd controller configuration
38+
39+
atmel,guard-time:
40+
$ref: /schemas/types.yaml#/definitions/uint32
41+
description: lcd guard time (Delay in frame periods)
42+
maximum: 127
43+
44+
bits-per-pixel:
45+
$ref: /schemas/types.yaml#/definitions/uint32
46+
description: lcd panel bit-depth.
47+
enum: [1, 2, 4, 8, 16, 24, 32]
48+
49+
atmel,lcdcon-backlight:
50+
$ref: /schemas/types.yaml#/definitions/flag
51+
description: enable backlight
52+
53+
atmel,lcdcon-backlight-inverted:
54+
$ref: /schemas/types.yaml#/definitions/flag
55+
description: invert backlight PWM polarity
56+
57+
atmel,lcd-wiring-mode:
58+
$ref: /schemas/types.yaml#/definitions/string
59+
description: lcd wiring mode "RGB" or "BRG"
60+
enum:
61+
- RGB
62+
- BRG
63+
64+
atmel,power-control-gpio:
65+
description: gpio to power on or off the LCD (as many as needed)
66+
maxItems: 1
67+
68+
display-timings:
69+
$ref: panel/display-timings.yaml#
70+
71+
required:
72+
- atmel,dmacon
73+
- atmel,lcdcon2
74+
- atmel,guard-time
75+
- bits-per-pixel
76+
77+
additionalProperties: false
78+
79+
examples:
80+
- |
81+
display: panel {
82+
bits-per-pixel = <32>;
83+
atmel,lcdcon-backlight;
84+
atmel,dmacon = <0x1>;
85+
atmel,lcdcon2 = <0x80008002>;
86+
atmel,guard-time = <9>;
87+
atmel,lcd-wiring-mode = "RGB";
88+
89+
display-timings {
90+
native-mode = <&timing0>;
91+
timing0: timing0 {
92+
clock-frequency = <9000000>;
93+
hactive = <480>;
94+
vactive = <272>;
95+
hback-porch = <1>;
96+
hfront-porch = <1>;
97+
vback-porch = <40>;
98+
vfront-porch = <1>;
99+
hsync-len = <45>;
100+
vsync-len = <1>;
101+
};
102+
};
103+
};

Documentation/devicetree/bindings/display/atmel,lcdc.txt

Lines changed: 0 additions & 87 deletions
This file was deleted.
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/atmel,lcdc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Microchip's LCDC Framebuffer
8+
9+
maintainers:
10+
- Nicolas Ferre <nicolas.ferre@microchip.com>
11+
- Dharma Balasubiramani <dharma.b@microchip.com>
12+
13+
description:
14+
The LCDC works with a framebuffer, which is a section of memory that contains
15+
a complete frame of data representing pixel values for the display. The LCDC
16+
reads the pixel data from the framebuffer and sends it to the LCD panel to
17+
render the image.
18+
19+
properties:
20+
compatible:
21+
enum:
22+
- atmel,at91sam9261-lcdc
23+
- atmel,at91sam9263-lcdc
24+
- atmel,at91sam9g10-lcdc
25+
- atmel,at91sam9g45-lcdc
26+
- atmel,at91sam9g45es-lcdc
27+
- atmel,at91sam9rl-lcdc
28+
29+
reg:
30+
maxItems: 1
31+
32+
interrupts:
33+
maxItems: 1
34+
35+
clocks:
36+
maxItems: 2
37+
38+
clock-names:
39+
items:
40+
- const: hclk
41+
- const: lcdc_clk
42+
43+
display:
44+
$ref: /schemas/types.yaml#/definitions/phandle
45+
description: A phandle pointing to the display node.
46+
47+
required:
48+
- compatible
49+
- reg
50+
- interrupts
51+
- clocks
52+
- clock-names
53+
- display
54+
55+
additionalProperties: false
56+
57+
examples:
58+
- |
59+
#include <dt-bindings/clock/at91.h>
60+
#include <dt-bindings/interrupt-controller/irq.h>
61+
fb@500000 {
62+
compatible = "atmel,at91sam9g45-lcdc";
63+
reg = <0x00500000 0x1000>;
64+
interrupts = <23 IRQ_TYPE_LEVEL_HIGH 0>;
65+
pinctrl-names = "default";
66+
pinctrl-0 = <&pinctrl_fb>;
67+
clocks = <&pmc PMC_TYPE_PERIPHERAL 23>, <&pmc PMC_TYPE_PERIPHERAL 23>;
68+
clock-names = "hclk", "lcdc_clk";
69+
display = <&display>;
70+
};

Documentation/devicetree/bindings/display/exynos/exynos_dp.txt

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

Documentation/devicetree/bindings/display/panel/abt,y030xx067a.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@ properties:
1717
compatible:
1818
const: abt,y030xx067a
1919

20+
reg:
21+
maxItems: 1
22+
2023
backlight: true
2124
port: true
2225
power-supply: true
23-
reg: true
2426
reset-gpios: true
2527

2628
required:

0 commit comments

Comments
 (0)