Skip to content

Commit d5152d3

Browse files
committed
Merge tag 'drm-misc-next-2020-03-17' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.7: UAPI Changes: Cross-subsystem Changes: Core Changes: - dp-mst: Remove register_connector callback, add drm_dp_destroy_connector - Changes to scnprintf on multiple instances Driver Changes: - meson: Support for YUV420 - panel: Support Ortustech COM37H3M, idk-1110wr and idk-2121wr, multiple dotclock fixes Signed-off-by: Dave Airlie <[email protected]> From: Maxime Ripard <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 71fa42f + 6afe692 commit d5152d3

Some content is hidden

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

44 files changed

+917
-229
lines changed
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/panel/advantech,idk-1110wr.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Advantech IDK-1110WR 10.1" WSVGA LVDS Display Panel
8+
9+
maintainers:
10+
- Lad Prabhakar <[email protected]>
11+
- Thierry Reding <[email protected]>
12+
13+
allOf:
14+
- $ref: lvds.yaml#
15+
16+
properties:
17+
compatible:
18+
items:
19+
- const: advantech,idk-1110wr
20+
- {} # panel-lvds, but not listed here to avoid false select
21+
22+
data-mapping:
23+
const: jeida-24
24+
25+
width-mm:
26+
const: 223
27+
28+
height-mm:
29+
const: 125
30+
31+
panel-timing: true
32+
port: true
33+
34+
additionalProperties: false
35+
36+
required:
37+
- compatible
38+
39+
examples:
40+
- |+
41+
panel {
42+
compatible = "advantech,idk-1110wr", "panel-lvds";
43+
44+
width-mm = <223>;
45+
height-mm = <125>;
46+
47+
data-mapping = "jeida-24";
48+
49+
panel-timing {
50+
/* 1024x600 @60Hz */
51+
clock-frequency = <51200000>;
52+
hactive = <1024>;
53+
vactive = <600>;
54+
hsync-len = <240>;
55+
hfront-porch = <40>;
56+
hback-porch = <40>;
57+
vsync-len = <10>;
58+
vfront-porch = <15>;
59+
vback-porch = <10>;
60+
};
61+
62+
port {
63+
panel_in: endpoint {
64+
remote-endpoint = <&lvds_encoder>;
65+
};
66+
};
67+
};
68+
69+
...
Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/panel/advantech,idk-2121wr.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Advantech IDK-2121WR 21.5" Full-HD dual-LVDS panel
8+
9+
maintainers:
10+
- Lad Prabhakar <[email protected]>
11+
- Thierry Reding <[email protected]>
12+
13+
description: |
14+
The IDK-2121WR from Advantech is a Full-HD dual-LVDS panel.
15+
A dual-LVDS interface is a dual-link connection with even pixels traveling
16+
on one link, and with odd pixels traveling on the other link.
17+
18+
The panel expects odd pixels on the first port, and even pixels on the
19+
second port, therefore the ports must be marked accordingly (with either
20+
dual-lvds-odd-pixels or dual-lvds-even-pixels).
21+
22+
properties:
23+
compatible:
24+
items:
25+
- const: advantech,idk-2121wr
26+
- {} # panel-lvds, but not listed here to avoid false select
27+
28+
width-mm:
29+
const: 476
30+
31+
height-mm:
32+
const: 268
33+
34+
data-mapping:
35+
const: vesa-24
36+
37+
panel-timing: true
38+
39+
ports:
40+
type: object
41+
properties:
42+
port@0:
43+
type: object
44+
description: The sink for odd pixels.
45+
properties:
46+
reg:
47+
const: 0
48+
49+
dual-lvds-odd-pixels: true
50+
51+
required:
52+
- reg
53+
- dual-lvds-odd-pixels
54+
55+
port@1:
56+
type: object
57+
description: The sink for even pixels.
58+
properties:
59+
reg:
60+
const: 1
61+
62+
dual-lvds-even-pixels: true
63+
64+
required:
65+
- reg
66+
- dual-lvds-even-pixels
67+
68+
additionalProperties: false
69+
70+
required:
71+
- compatible
72+
- width-mm
73+
- height-mm
74+
- data-mapping
75+
- panel-timing
76+
- ports
77+
78+
examples:
79+
- |+
80+
panel-lvds {
81+
compatible = "advantech,idk-2121wr", "panel-lvds";
82+
83+
width-mm = <476>;
84+
height-mm = <268>;
85+
86+
data-mapping = "vesa-24";
87+
88+
panel-timing {
89+
clock-frequency = <148500000>;
90+
hactive = <1920>;
91+
vactive = <1080>;
92+
hsync-len = <44>;
93+
hfront-porch = <88>;
94+
hback-porch = <148>;
95+
vfront-porch = <4>;
96+
vback-porch = <36>;
97+
vsync-len = <5>;
98+
};
99+
100+
ports {
101+
#address-cells = <1>;
102+
#size-cells = <0>;
103+
104+
port@0 {
105+
reg = <0>;
106+
dual-lvds-odd-pixels;
107+
panel_in0: endpoint {
108+
remote-endpoint = <&lvds0_out>;
109+
};
110+
};
111+
112+
port@1 {
113+
reg = <1>;
114+
dual-lvds-even-pixels;
115+
panel_in1: endpoint {
116+
remote-endpoint = <&lvds1_out>;
117+
};
118+
};
119+
};
120+
};
121+
122+
...

Documentation/devicetree/bindings/display/panel/elida,kd35t133.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ additionalProperties: false
3434

3535
examples:
3636
- |
37-
dsi@ff450000 {
37+
dsi {
3838
#address-cells = <1>;
3939
#size-cells = <0>;
4040
panel@0 {

Documentation/devicetree/bindings/display/panel/leadtek,ltk500hd1829.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ additionalProperties: false
3434

3535
examples:
3636
- |
37-
dsi@ff450000 {
37+
dsi {
3838
#address-cells = <1>;
3939
#size-cells = <0>;
4040
reg = <0xff450000 0x1000>;

Documentation/devicetree/bindings/display/panel/novatek,nt35510.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ examples:
4040
- |
4141
#include <dt-bindings/gpio/gpio.h>
4242
43-
dsi@a0351000 {
43+
dsi {
4444
#address-cells = <1>;
4545
#size-cells = <0>;
46-
panel {
46+
panel@0 {
4747
compatible = "hydis,hva40wv1", "novatek,nt35510";
4848
reg = <0>;
4949
vdd-supply = <&ab8500_ldo_aux4_reg>;

Documentation/devicetree/bindings/display/panel/orisetech,otm8009a.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ required:
3939

4040
examples:
4141
- |
42-
dsi@0 {
42+
dsi {
4343
#address-cells = <1>;
4444
#size-cells = <0>;
4545
panel@0 {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ additionalProperties: false
4848

4949
examples:
5050
- |
51-
panel@0 {
51+
panel {
5252
compatible = "osddisplays,osd057T0559-34ts", "panel-dpi";
5353
label = "osddisplay";
5454
power-supply = <&vcc_supply>;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ required:
5050

5151
examples:
5252
- |
53-
mdss_dsi@fd922800 {
53+
dsi {
5454
#address-cells = <1>;
5555
#size-cells = <0>;
5656
panel@0 {

Documentation/devicetree/bindings/display/panel/raydium,rm68200.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ required:
4242

4343
examples:
4444
- |
45-
dsi@0 {
45+
dsi {
4646
#address-cells = <1>;
4747
#size-cells = <0>;
4848
panel@0 {

Documentation/devicetree/bindings/display/panel/xinpeng,xpp055c272.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ additionalProperties: false
3434

3535
examples:
3636
- |
37-
dsi@ff450000 {
37+
dsi {
3838
#address-cells = <1>;
3939
#size-cells = <0>;
4040
reg = <0xff450000 0x1000>;

0 commit comments

Comments
 (0)