Skip to content

Commit e2a9f0a

Browse files
committed
Merge drm/drm-next into drm-intel-next
Sync the drm-intel-gt-next changes back to drm-intel-next via drm-next. Signed-off-by: Jani Nikula <jani.nikula@intel.com>
2 parents 3e36c49 + 85d712f commit e2a9f0a

497 files changed

Lines changed: 11303 additions & 4747 deletions

File tree

Some content is hidden

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

Documentation/block/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ Block
1818
kyber-iosched
1919
null_blk
2020
pr
21-
request
2221
stat
2322
switching-sched
2423
writeback_cache_control

Documentation/block/request.rst

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

Documentation/devicetree/bindings/display/bridge/fsl,ldb.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ description: |
1717
properties:
1818
compatible:
1919
enum:
20+
- fsl,imx6sx-ldb
2021
- fsl,imx8mp-ldb
2122
- fsl,imx93-ldb
2223

@@ -64,7 +65,9 @@ allOf:
6465
properties:
6566
compatible:
6667
contains:
67-
const: fsl,imx93-ldb
68+
enum:
69+
- fsl,imx6sx-ldb
70+
- fsl,imx93-ldb
6871
then:
6972
properties:
7073
ports:

Documentation/devicetree/bindings/display/bridge/samsung,mipi-dsim.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,29 @@ properties:
105105
DSI output port node to the panel or the next bridge
106106
in the chain.
107107

108+
properties:
109+
endpoint:
110+
$ref: /schemas/media/video-interfaces.yaml#
111+
unevaluatedProperties: false
112+
113+
properties:
114+
data-lanes:
115+
minItems: 1
116+
maxItems: 4
117+
uniqueItems: true
118+
items:
119+
enum: [ 1, 2, 3, 4 ]
120+
121+
lane-polarities:
122+
minItems: 1
123+
maxItems: 5
124+
description:
125+
The Samsung MIPI DSI IP requires that all the data lanes have
126+
the same polarity.
127+
128+
dependencies:
129+
lane-polarities: [data-lanes]
130+
108131
required:
109132
- clock-names
110133
- clocks

Documentation/devicetree/bindings/display/bridge/toshiba,tc358767.yaml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,24 @@
44
$id: http://devicetree.org/schemas/display/bridge/toshiba,tc358767.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Toshiba TC358767 eDP bridge
7+
title: Toshiba TC358767/TC358867/TC9595 DSI/DPI/eDP bridge
88

99
maintainers:
1010
- Andrey Gusakov <andrey.gusakov@cogentembedded.com>
1111

12-
description: The TC358767 is bridge device which converts DSI/DPI to eDP/DP
12+
description: |
13+
The TC358767/TC358867/TC9595 is bridge device which
14+
converts DSI/DPI to eDP/DP .
1315
1416
properties:
1517
compatible:
16-
const: toshiba,tc358767
18+
oneOf:
19+
- items:
20+
- enum:
21+
- toshiba,tc358867
22+
- toshiba,tc9595
23+
- const: toshiba,tc358767
24+
- const: toshiba,tc358767
1725

1826
reg:
1927
enum:

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,16 @@ allOf:
1919

2020
properties:
2121
compatible:
22-
items:
23-
- enum:
24-
- xiaomi,elish-boe-nt36523
25-
- xiaomi,elish-csot-nt36523
26-
- const: novatek,nt36523
22+
oneOf:
23+
- items:
24+
- enum:
25+
- xiaomi,elish-boe-nt36523
26+
- xiaomi,elish-csot-nt36523
27+
- const: novatek,nt36523
28+
- items:
29+
- enum:
30+
- lenovo,j606f-boe-nt36523w
31+
- const: novatek,nt36523w
2732

2833
reset-gpios:
2934
maxItems: 1
@@ -34,6 +39,7 @@ properties:
3439

3540
reg: true
3641
ports: true
42+
rotation: true
3743
backlight: true
3844

3945
required:

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ properties:
7777
- auo,t215hvn01
7878
# Shanghai AVIC Optoelectronics 7" 1024x600 color TFT-LCD panel
7979
- avic,tm070ddh03
80+
# BOE EV121WXM-N10-1850 12.1" WXGA (1280x800) TFT LCD panel
81+
- boe,ev121wxm-n10-1850
8082
# BOE HV070WSA-100 7.01" WSVGA TFT LCD panel
8183
- boe,hv070wsa-100
8284
# BOE OPTOELECTRONICS TECHNOLOGY 10.1" WXGA TFT LCD panel
@@ -174,6 +176,8 @@ properties:
174176
- innolux,at043tn24
175177
# Innolux AT070TN92 7.0" WQVGA TFT LCD panel
176178
- innolux,at070tn92
179+
# Innolux G070ACE-L01 7" WVGA (800x480) TFT LCD panel
180+
- innolux,g070ace-l01
177181
# Innolux G070Y2-L01 7" WVGA (800x480) TFT LCD panel
178182
- innolux,g070y2-l01
179183
# Innolux G070Y2-T02 7" WVGA (800x480) TFT LCD TTL panel

Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ allOf:
2020
properties:
2121
compatible:
2222
enum:
23+
# Anberic RG353V-V2 5.0" 640x480 TFT LCD panel
24+
- anbernic,rg353v-panel-v2
2325
# Rocktech JH057N00900 5.5" 720x1440 TFT LCD panel
2426
- rocktech,jh057n00900
2527
# Xingbangda XBD599 5.99" 720x1440 TFT LCD panel
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-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/panel/samsung,s6d7aa0.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Samsung S6D7AA0 MIPI-DSI LCD panel controller
8+
9+
maintainers:
10+
- Artur Weber <aweber.kernel@gmail.com>
11+
12+
allOf:
13+
- $ref: panel-common.yaml#
14+
15+
properties:
16+
compatible:
17+
items:
18+
- enum:
19+
# 1280x800 LSL080AL02 panel
20+
- samsung,lsl080al02
21+
# 1024x768 LSL080AL03 panel
22+
- samsung,lsl080al03
23+
# 1024x768 LTL101AT01 panel
24+
- samsung,ltl101at01
25+
- const: samsung,s6d7aa0
26+
27+
reg: true
28+
29+
backlight:
30+
description:
31+
Backlight to use for the panel. If this property is set on panels
32+
that have DSI-based backlight control (LSL080AL03 and LTL101AT01),
33+
it overrides the DSI-based backlight.
34+
35+
reset-gpios:
36+
description: Reset GPIO pin, usually GPIO_ACTIVE_LOW.
37+
38+
power-supply:
39+
description:
40+
Main power supply for the panel; the exact voltage differs between
41+
panels, and is usually somewhere around 3.3-5v.
42+
43+
vmipi-supply:
44+
description: VMIPI supply, usually 1.8v.
45+
46+
required:
47+
- compatible
48+
- reg
49+
- reset-gpios
50+
51+
additionalProperties: false
52+
53+
examples:
54+
- |
55+
#include <dt-bindings/gpio/gpio.h>
56+
57+
dsi {
58+
#address-cells = <1>;
59+
#size-cells = <0>;
60+
61+
panel@0 {
62+
compatible = "samsung,lsl080al02", "samsung,s6d7aa0";
63+
reg = <0>;
64+
power-supply = <&display_3v3_supply>;
65+
reset-gpios = <&gpf0 4 GPIO_ACTIVE_LOW>;
66+
backlight = <&backlight>;
67+
};
68+
};
69+
70+
...

Documentation/devicetree/bindings/media/i2c/ovti,ov2685.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ properties:
4949

5050
properties:
5151
data-lanes:
52+
minItems: 1
5253
maxItems: 2
5354

5455
required:

0 commit comments

Comments
 (0)