Skip to content

Commit f9ae00b

Browse files
committed
Merge tag 'drm-misc-next-2024-08-22' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for v6.12: Cross-subsystem Changes: string: - add mem_is_zero() Core Changes: edid: - use mem_is_zero() Driver Changes: ast: - reorganize output code by type (VGA, DP, etc) - convert to struct drm_edid - fix BMC handling for all outputs bridge: - anx7625: simplify OF array handling - dw-hdmi: simplify clock handling - lontium-lt8912b: fix mode validation - nwl-dsi: fix mode vsync/hsync polarity panel: - ili9341: fix comments - jd9365da: fix "exit sleep" commands - jdi-fhd-r63452: simplify error handling with DSI multi-style helpers - mantix-mlaf057we51: simplify error handling with DSI multi-style helpers - simple: support Innolux G070ACE-LH3 plus DT bindings; support On Tat Industrial Company KD50G21-40NT-A1 plus DT bindings - st7701: decouple DSI and DRM code; add SPI support; support Anbernic RG28XX plus DT bindings vc4: - fix PM during detect - replace DRM_ERROR() with drm_error() - v3d: simplify clock retrieval Signed-off-by: Daniel Vetter <[email protected]> From: Thomas Zimmermann <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 11df68c + f60ef67 commit f9ae00b

Some content is hidden

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

41 files changed

+1830
-1478
lines changed

Documentation/devicetree/bindings/display/panel/panel-simple.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,8 @@ properties:
158158
- innolux,at070tn92
159159
# Innolux G070ACE-L01 7" WVGA (800x480) TFT LCD panel
160160
- innolux,g070ace-l01
161+
# Innolux G070ACE-LH3 7" WVGA (800x480) TFT LCD panel with WLED backlight
162+
- innolux,g070ace-lh3
161163
# Innolux G070Y2-L01 7" WVGA (800x480) TFT LCD panel
162164
- innolux,g070y2-l01
163165
# Innolux G070Y2-T02 7" WVGA (800x480) TFT LCD TTL panel
@@ -222,6 +224,8 @@ properties:
222224
- okaya,rs800480t-7x0gp
223225
# Olimex 4.3" TFT LCD panel
224226
- olimex,lcd-olinuxino-43-ts
227+
# On Tat Industrial Company 5" DPI TFT panel.
228+
- ontat,kd50g21-40nt-a1
225229
# On Tat Industrial Company 7" DPI TFT panel.
226230
- ontat,yx700wv03
227231
# OrtusTech COM37H3M05DTC Blanview 3.7" VGA portrait TFT-LCD panel

Documentation/devicetree/bindings/display/panel/sitronix,st7701.yaml

Lines changed: 64 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,19 @@ description: |
2020
Densitron DMT028VGHMCMI-1A is 480x640, 2-lane MIPI DSI LCD panel
2121
which has built-in ST7701 chip.
2222
23-
allOf:
24-
- $ref: panel-common.yaml#
25-
2623
properties:
2724
compatible:
2825
items:
2926
- enum:
3027
- anbernic,rg-arc-panel
28+
- anbernic,rg28xx-panel
3129
- densitron,dmt028vghmcmi-1a
3230
- elida,kd50t048a
3331
- techstar,ts8550b
3432
- const: sitronix,st7701
3533

3634
reg:
37-
description: DSI virtual channel used by that screen
35+
description: DSI / SPI channel used by that screen
3836
maxItems: 1
3937

4038
VCC-supply:
@@ -43,6 +41,13 @@ properties:
4341
IOVCC-supply:
4442
description: I/O system regulator
4543

44+
dc-gpios:
45+
maxItems: 1
46+
description:
47+
Controller data/command selection (D/CX) in 4-line SPI mode.
48+
If not set, the controller is in 3-line SPI mode.
49+
Disallowed for DSI.
50+
4651
port: true
4752
reset-gpios: true
4853
rotation: true
@@ -57,7 +62,38 @@ required:
5762
- port
5863
- reset-gpios
5964

60-
additionalProperties: false
65+
allOf:
66+
- $ref: panel-common.yaml#
67+
- if:
68+
properties:
69+
compatible:
70+
contains:
71+
# SPI connected panels
72+
enum:
73+
- anbernic,rg28xx-panel
74+
then:
75+
$ref: /schemas/spi/spi-peripheral-props.yaml#
76+
77+
- if:
78+
properties:
79+
compatible:
80+
not:
81+
contains:
82+
# DSI or SPI without D/CX pin
83+
enum:
84+
- anbernic,rg-arc-panel
85+
- anbernic,rg28xx-panel
86+
- densitron,dmt028vghmcmi-1a
87+
- elida,kd50t048a
88+
- techstar,ts8550b
89+
then:
90+
required:
91+
- dc-gpios
92+
else:
93+
properties:
94+
dc-gpios: false
95+
96+
unevaluatedProperties: false
6197

6298
examples:
6399
- |
@@ -82,3 +118,26 @@ examples:
82118
};
83119
};
84120
};
121+
- |
122+
#include <dt-bindings/gpio/gpio.h>
123+
124+
spi {
125+
#address-cells = <1>;
126+
#size-cells = <0>;
127+
128+
panel@0 {
129+
compatible = "anbernic,rg28xx-panel", "sitronix,st7701";
130+
reg = <0>;
131+
spi-max-frequency = <3125000>;
132+
VCC-supply = <&reg_lcd>;
133+
IOVCC-supply = <&reg_lcd>;
134+
reset-gpios = <&pio 8 14 GPIO_ACTIVE_HIGH>; /* LCD-RST: PI14 */
135+
backlight = <&backlight>;
136+
137+
port {
138+
panel_in_rgb: endpoint {
139+
remote-endpoint = <&tcon_lcd0_out_lcd>;
140+
};
141+
};
142+
};
143+
};

MAINTAINERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18771,7 +18771,6 @@ F: include/dt-bindings/clock/qcom,*
1877118771
QUALCOMM CLOUD AI (QAIC) DRIVER
1877218772
M: Jeffrey Hugo <[email protected]>
1877318773
R: Carl Vanderlip <[email protected]>
18774-
R: Pranjal Ramajor Asha Kanojiya <[email protected]>
1877518774
1877618775
1877718776
S: Supported

drivers/gpu/drm/ast/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ ast-y := \
1111
ast_main.o \
1212
ast_mm.o \
1313
ast_mode.o \
14-
ast_post.o
14+
ast_post.o \
15+
ast_sil164.o \
16+
ast_vga.o
1517

1618
obj-$(CONFIG_DRM_AST) := ast.o

0 commit comments

Comments
 (0)