Skip to content

Commit d678c63

Browse files
committed
Merge tag 'drm-misc-next-2024-12-19' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for 6.14: UAPI Changes: Cross-subsystem Changes: Core Changes: - connector: Add a mutex to protect ELD access, Add a helper to create a connector in two steps Driver Changes: - amdxdna: Add RyzenAI-npu6 Support, various improvements - rcar-du: Add r8a779h0 Support - rockchip: various improvements - zynqmp: Add DP audio support - bridges: - ti-sn65dsi83: Add ti,lvds-vod-swing optional properties - panels: - new panels: Tianma TM070JDHG34-00, Multi-Inno Technology MI1010Z1T-1CP11 Signed-off-by: Dave Airlie <[email protected]> From: Maxime Ripard <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/20241219-truthful-demonic-hound-598f63@houat
2 parents 8368e97 + 1e93f59 commit d678c63

File tree

166 files changed

+6445
-1101
lines changed

Some content is hidden

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

166 files changed

+6445
-1101
lines changed

Documentation/devicetree/bindings/display/bridge/renesas,dsi-csi2-tx.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ properties:
1919
enum:
2020
- renesas,r8a779a0-dsi-csi2-tx # for V3U
2121
- renesas,r8a779g0-dsi-csi2-tx # for V4H
22+
- renesas,r8a779h0-dsi-csi2-tx # for V4M
2223

2324
reg:
2425
maxItems: 1

Documentation/devicetree/bindings/display/bridge/ti,sn65dsi83.yaml

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@ properties:
8080
- const: 4
8181

8282
port@2:
83-
$ref: /schemas/graph.yaml#/properties/port
8483
description: Video port for LVDS Channel-A output (panel or bridge).
84+
$ref: '#/$defs/lvds-port'
8585

8686
port@3:
87-
$ref: /schemas/graph.yaml#/properties/port
8887
description: Video port for LVDS Channel-B output (panel or bridge).
88+
$ref: '#/$defs/lvds-port'
8989

9090
required:
9191
- port@0
@@ -96,6 +96,36 @@ required:
9696
- reg
9797
- ports
9898

99+
$defs:
100+
lvds-port:
101+
$ref: /schemas/graph.yaml#/$defs/port-base
102+
unevaluatedProperties: false
103+
104+
properties:
105+
endpoint:
106+
$ref: /schemas/media/video-interfaces.yaml#
107+
unevaluatedProperties: false
108+
109+
properties:
110+
ti,lvds-termination-ohms:
111+
description: The value of near end differential termination in ohms.
112+
enum: [100, 200]
113+
default: 200
114+
115+
ti,lvds-vod-swing-clock-microvolt:
116+
description: LVDS diferential output voltage <min max> for clock
117+
lanes in microvolts.
118+
$ref: /schemas/types.yaml#/definitions/uint32-array
119+
minItems: 2
120+
maxItems: 2
121+
122+
ti,lvds-vod-swing-data-microvolt:
123+
description: LVDS diferential output voltage <min max> for data
124+
lanes in microvolts.
125+
$ref: /schemas/types.yaml#/definitions/uint32-array
126+
minItems: 2
127+
maxItems: 2
128+
99129
allOf:
100130
- if:
101131
properties:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ properties:
4242
# Admatec 9904379 10.1" 1024x600 LVDS panel
4343
- admatec,9904379
4444
- auo,b101ew05
45+
# AUO G084SN05 V9 8.4" 800x600 LVDS panel
46+
- auo,g084sn05
4547
# Chunghwa Picture Tubes Ltd. 7" WXGA (800x1280) TFT LCD LVDS panel
4648
- chunghwa,claa070wp03xg
4749
# EDT ETML0700Z9NDHA 7.0" WSVGA (1024x600) color TFT LCD LVDS panel

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,12 +206,16 @@ properties:
206206
- mitsubishi,aa070mc01-ca1
207207
# Mitsubishi AA084XE01 8.4" XGA TFT LCD panel
208208
- mitsubishi,aa084xe01
209+
# Multi-Inno Technology Co.,Ltd MI0700A2T-30 7" 800x480 TFT Resistive Touch Module
210+
- multi-inno,mi0700a2t-30
209211
# Multi-Inno Technology Co.,Ltd MI0700S4T-6 7" 800x480 TFT Resistive Touch Module
210212
- multi-inno,mi0700s4t-6
211213
# Multi-Inno Technology Co.,Ltd MI0800FT-9 8" 800x600 TFT Resistive Touch Module
212214
- multi-inno,mi0800ft-9
213215
# Multi-Inno Technology Co.,Ltd MI1010AIT-1CP 10.1" 1280x800 LVDS IPS Cap Touch Mod.
214216
- multi-inno,mi1010ait-1cp
217+
# Multi-Inno Technology Co.,Ltd MI1010Z1T-1CP11 10.1" 1024x600 TFT Resistive Touch Module
218+
- multi-inno,mi1010z1t-1cp11
215219
# NEC LCD Technologies, Ltd. 12.1" WXGA (1280x800) LVDS TFT LCD panel
216220
- nec,nl12880bc20-05
217221
# NEC LCD Technologies,Ltd. WQVGA TFT LCD panel
@@ -280,6 +284,8 @@ properties:
280284
- team-source-display,tst043015cmhx
281285
# Tianma Micro-electronics TM070JDHG30 7.0" WXGA TFT LCD panel
282286
- tianma,tm070jdhg30
287+
# Tianma Micro-electronics TM070JDHG34-00 7.0" WXGA (1280x800) LVDS TFT LCD panel
288+
- tianma,tm070jdhg34-00
283289
# Tianma Micro-electronics TM070JVHG33 7.0" WXGA TFT LCD panel
284290
- tianma,tm070jvhg33
285291
# Tianma Micro-electronics TM070RVHG71 7.0" WXGA TFT LCD panel

Documentation/devicetree/bindings/display/renesas,du.yaml

Lines changed: 62 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ properties:
4141
- renesas,du-r8a77995 # for R-Car D3 compatible DU
4242
- renesas,du-r8a779a0 # for R-Car V3U compatible DU
4343
- renesas,du-r8a779g0 # for R-Car V4H compatible DU
44+
- renesas,du-r8a779h0 # for R-Car V4M compatible DU
4445

4546
reg:
4647
maxItems: 1
@@ -69,14 +70,12 @@ properties:
6970
$ref: /schemas/graph.yaml#/properties/port
7071
unevaluatedProperties: false
7172

72-
required:
73-
- port@0
74-
- port@1
75-
7673
unevaluatedProperties: false
7774

7875
renesas,cmms:
7976
$ref: /schemas/types.yaml#/definitions/phandle-array
77+
minItems: 1
78+
maxItems: 4
8079
items:
8180
maxItems: 1
8281
description:
@@ -85,6 +84,8 @@ properties:
8584

8685
renesas,vsps:
8786
$ref: /schemas/types.yaml#/definitions/phandle-array
87+
minItems: 1
88+
maxItems: 4
8889
items:
8990
items:
9091
- description: phandle to VSP instance that serves the DU channel
@@ -489,9 +490,11 @@ allOf:
489490

490491
renesas,cmms:
491492
minItems: 4
493+
maxItems: 4
492494

493495
renesas,vsps:
494496
minItems: 4
497+
maxItems: 4
495498

496499
required:
497500
- clock-names
@@ -558,9 +561,11 @@ allOf:
558561

559562
renesas,cmms:
560563
minItems: 3
564+
maxItems: 3
561565

562566
renesas,vsps:
563567
minItems: 3
568+
maxItems: 3
564569

565570
required:
566571
- clock-names
@@ -627,9 +632,11 @@ allOf:
627632

628633
renesas,cmms:
629634
minItems: 3
635+
maxItems: 3
630636

631637
renesas,vsps:
632638
minItems: 3
639+
maxItems: 3
633640

634641
required:
635642
- clock-names
@@ -683,7 +690,7 @@ allOf:
683690
- port@1
684691

685692
renesas,vsps:
686-
minItems: 1
693+
maxItems: 1
687694

688695
required:
689696
- clock-names
@@ -746,9 +753,11 @@ allOf:
746753

747754
renesas,cmms:
748755
minItems: 2
756+
maxItems: 2
749757

750758
renesas,vsps:
751759
minItems: 2
760+
maxItems: 2
752761

753762
required:
754763
- clock-names
@@ -799,6 +808,54 @@ allOf:
799808

800809
renesas,vsps:
801810
minItems: 2
811+
maxItems: 2
812+
813+
required:
814+
- clock-names
815+
- interrupts
816+
- resets
817+
- reset-names
818+
- renesas,vsps
819+
820+
- if:
821+
properties:
822+
compatible:
823+
contains:
824+
enum:
825+
- renesas,du-r8a779h0
826+
then:
827+
properties:
828+
clocks:
829+
items:
830+
- description: Functional clock
831+
832+
clock-names:
833+
items:
834+
- const: du.0
835+
836+
interrupts:
837+
maxItems: 1
838+
839+
resets:
840+
maxItems: 1
841+
842+
reset-names:
843+
items:
844+
- const: du.0
845+
846+
ports:
847+
properties:
848+
port@0:
849+
description: DSI 0
850+
port@1: false
851+
port@2: false
852+
port@3: false
853+
854+
required:
855+
- port@0
856+
857+
renesas,vsps:
858+
maxItems: 1
802859

803860
required:
804861
- clock-names
Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/rockchip/rockchip,rk3588-mipi-dsi2.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Rockchip specific extensions to the Synopsys Designware MIPI DSI2
8+
9+
maintainers:
10+
- Heiko Stuebner <[email protected]>
11+
12+
properties:
13+
compatible:
14+
enum:
15+
- rockchip,rk3588-mipi-dsi2
16+
17+
reg:
18+
maxItems: 1
19+
20+
interrupts:
21+
maxItems: 1
22+
23+
clocks:
24+
maxItems: 2
25+
26+
clock-names:
27+
items:
28+
- const: pclk
29+
- const: sys
30+
31+
rockchip,grf:
32+
$ref: /schemas/types.yaml#/definitions/phandle
33+
description:
34+
This SoC uses GRF regs to switch between vopl/vopb.
35+
36+
phys:
37+
maxItems: 1
38+
39+
phy-names:
40+
const: dcphy
41+
42+
power-domains:
43+
maxItems: 1
44+
45+
resets:
46+
maxItems: 1
47+
48+
reset-names:
49+
const: apb
50+
51+
ports:
52+
$ref: /schemas/graph.yaml#/properties/ports
53+
54+
properties:
55+
port@0:
56+
$ref: /schemas/graph.yaml#/properties/port
57+
description: Input node to receive pixel data.
58+
59+
port@1:
60+
$ref: /schemas/graph.yaml#/properties/port
61+
description: DSI output node to panel.
62+
63+
required:
64+
- port@0
65+
- port@1
66+
67+
required:
68+
- compatible
69+
- clocks
70+
- clock-names
71+
- rockchip,grf
72+
- phys
73+
- phy-names
74+
- ports
75+
- reg
76+
77+
allOf:
78+
- $ref: /schemas/display/dsi-controller.yaml#
79+
80+
unevaluatedProperties: false
81+
82+
examples:
83+
- |
84+
#include <dt-bindings/clock/rockchip,rk3588-cru.h>
85+
#include <dt-bindings/interrupt-controller/arm-gic.h>
86+
#include <dt-bindings/interrupt-controller/irq.h>
87+
#include <dt-bindings/phy/phy.h>
88+
#include <dt-bindings/power/rk3588-power.h>
89+
#include <dt-bindings/reset/rockchip,rk3588-cru.h>
90+
91+
soc {
92+
#address-cells = <2>;
93+
#size-cells = <2>;
94+
95+
dsi@fde20000 {
96+
compatible = "rockchip,rk3588-mipi-dsi2";
97+
reg = <0x0 0xfde20000 0x0 0x10000>;
98+
interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH 0>;
99+
clocks = <&cru PCLK_DSIHOST0>, <&cru CLK_DSIHOST0>;
100+
clock-names = "pclk", "sys";
101+
resets = <&cru SRST_P_DSIHOST0>;
102+
reset-names = "apb";
103+
power-domains = <&power RK3588_PD_VOP>;
104+
phys = <&mipidcphy0 PHY_TYPE_DPHY>;
105+
phy-names = "dcphy";
106+
rockchip,grf = <&vop_grf>;
107+
108+
ports {
109+
#address-cells = <1>;
110+
#size-cells = <0>;
111+
dsi0_in: port@0 {
112+
reg = <0>;
113+
};
114+
115+
dsi0_out: port@1 {
116+
reg = <1>;
117+
};
118+
};
119+
};
120+
};

Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,16 @@ properties:
100100
- description: Video layer, plane 1 (U/V or U)
101101
- description: Video layer, plane 2 (V)
102102
- description: Graphics layer
103+
- description: Audio channel 0
104+
- description: Audio channel 1
103105
dma-names:
104106
items:
105107
- const: vid0
106108
- const: vid1
107109
- const: vid2
108110
- const: gfx0
111+
- const: aud0
112+
- const: aud1
109113

110114
phys:
111115
description: PHYs for the DP data lanes
@@ -194,11 +198,13 @@ examples:
194198
power-domains = <&pd_dp>;
195199
resets = <&reset ZYNQMP_RESET_DP>;
196200
197-
dma-names = "vid0", "vid1", "vid2", "gfx0";
201+
dma-names = "vid0", "vid1", "vid2", "gfx0", "aud0", "aud1";
198202
dmas = <&xlnx_dpdma 0>,
199203
<&xlnx_dpdma 1>,
200204
<&xlnx_dpdma 2>,
201-
<&xlnx_dpdma 3>;
205+
<&xlnx_dpdma 3>,
206+
<&xlnx_dpdma 4>,
207+
<&xlnx_dpdma 5>;
202208
203209
phys = <&psgtr 1 PHY_TYPE_DP 0 3>,
204210
<&psgtr 0 PHY_TYPE_DP 1 3>;

0 commit comments

Comments
 (0)