Skip to content

Commit 80c9b58

Browse files
committed
Merge tag 'du-next-20200514' of git://linuxtv.org/pinchartl/media into drm-next
R-Car Display Unit & related changes: - DT bindings conversion to YAML - Planes zpos sanity check and fix - MAINTAINERS entry for LVDS panel driver Signed-off-by: Dave Airlie <[email protected]> From: Laurent Pinchart <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 49eea1c + 7982471 commit 80c9b58

File tree

15 files changed

+294
-234
lines changed

15 files changed

+294
-234
lines changed

Documentation/devicetree/bindings/display/bridge/adi,adv7123.txt

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

Documentation/devicetree/bindings/display/bridge/anx6345.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@ properties:
3737
type: object
3838

3939
properties:
40+
'#address-cells':
41+
const: 1
42+
43+
'#size-cells':
44+
const: 0
45+
4046
port@0:
4147
type: object
4248
description: |
@@ -51,6 +57,8 @@ properties:
5157
required:
5258
- port@0
5359

60+
additionalProperties: false
61+
5462
required:
5563
- compatible
5664
- reg

Documentation/devicetree/bindings/display/bridge/dumb-vga-dac.txt

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

Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@ properties:
5050
This device has two video ports. Their connections are modeled using the
5151
OF graph bindings specified in Documentation/devicetree/bindings/graph.txt
5252
properties:
53+
'#address-cells':
54+
const: 1
55+
56+
'#size-cells':
57+
const: 0
58+
5359
port@0:
5460
type: object
5561
description: |
@@ -66,6 +72,8 @@ properties:
6672
- port@0
6773
- port@1
6874

75+
additionalProperties: false
76+
6977
powerdown-gpios:
7078
description:
7179
The GPIO used to control the power down line of this device.

Documentation/devicetree/bindings/display/bridge/ps8640.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@ properties:
5050
Documentation/devicetree/bindings/media/video-interfaces.txt
5151
Documentation/devicetree/bindings/graph.txt
5252
properties:
53+
'#address-cells':
54+
const: 1
55+
56+
'#size-cells':
57+
const: 0
58+
5359
port@0:
5460
type: object
5561
description: |
@@ -63,6 +69,8 @@ properties:
6369
required:
6470
- port@0
6571

72+
additionalProperties: false
73+
6674
required:
6775
- compatible
6876
- reg
Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/bridge/simple-bridge.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Transparent non-programmable DRM bridges
8+
9+
maintainers:
10+
- Laurent Pinchart <[email protected]>
11+
- Maxime Ripard <[email protected]>
12+
13+
description: |
14+
This binding supports transparent non-programmable bridges that don't require
15+
any configuration, with a single input and a single output.
16+
17+
properties:
18+
compatible:
19+
oneOf:
20+
- items:
21+
- enum:
22+
- ti,ths8134a
23+
- ti,ths8134b
24+
- const: ti,ths8134
25+
- enum:
26+
- adi,adv7123
27+
- dumb-vga-dac
28+
- ti,opa362
29+
- ti,ths8134
30+
- ti,ths8135
31+
32+
ports:
33+
type: object
34+
description: |
35+
This device has two video ports. Their connections are modeled using the
36+
OF graph bindings specified in Documentation/devicetree/bindings/graph.txt.
37+
properties:
38+
'#address-cells':
39+
const: 1
40+
41+
'#size-cells':
42+
const: 0
43+
44+
port@0:
45+
type: object
46+
description: The bridge input
47+
48+
port@1:
49+
type: object
50+
description: The bridge output
51+
52+
required:
53+
- port@0
54+
- port@1
55+
56+
additionalProperties: false
57+
58+
enable-gpios:
59+
maxItems: 1
60+
description: GPIO controlling bridge enable
61+
62+
vdd-supply:
63+
maxItems: 1
64+
description: Power supply for the bridge
65+
66+
required:
67+
- compatible
68+
- ports
69+
70+
additionalProperties: false
71+
72+
examples:
73+
- |
74+
bridge {
75+
compatible = "ti,ths8134a", "ti,ths8134";
76+
77+
ports {
78+
#address-cells = <1>;
79+
#size-cells = <0>;
80+
81+
port@0 {
82+
reg = <0>;
83+
84+
vga_bridge_in: endpoint {
85+
remote-endpoint = <&tcon0_out_vga>;
86+
};
87+
};
88+
89+
port@1 {
90+
reg = <1>;
91+
92+
vga_bridge_out: endpoint {
93+
remote-endpoint = <&vga_con_in>;
94+
};
95+
};
96+
};
97+
};
98+
99+
...

Documentation/devicetree/bindings/display/bridge/thine,thc63lvd1024.txt

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

0 commit comments

Comments
 (0)