Skip to content

Commit

Permalink
Merge tag 'du-next-20200514' of git://linuxtv.org/pinchartl/media int…
Browse files Browse the repository at this point in the history
…o 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 <airlied@redhat.com>

From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200514012844.GA7196@pendragon.ideasonboard.com
  • Loading branch information
Dave Airlie committed May 14, 2020
2 parents 49eea1c + 7982471 commit 80c9b58
Show file tree
Hide file tree
Showing 15 changed files with 294 additions and 234 deletions.
50 changes: 0 additions & 50 deletions Documentation/devicetree/bindings/display/bridge/adi,adv7123.txt

This file was deleted.

8 changes: 8 additions & 0 deletions Documentation/devicetree/bindings/display/bridge/anx6345.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ properties:
type: object

properties:
'#address-cells':
const: 1

'#size-cells':
const: 0

port@0:
type: object
description: |
Expand All @@ -51,6 +57,8 @@ properties:
required:
- port@0

additionalProperties: false

required:
- compatible
- reg
Expand Down
50 changes: 0 additions & 50 deletions Documentation/devicetree/bindings/display/bridge/dumb-vga-dac.txt

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ properties:
This device has two video ports. Their connections are modeled using the
OF graph bindings specified in Documentation/devicetree/bindings/graph.txt
properties:
'#address-cells':
const: 1

'#size-cells':
const: 0

port@0:
type: object
description: |
Expand All @@ -66,6 +72,8 @@ properties:
- port@0
- port@1

additionalProperties: false

powerdown-gpios:
description:
The GPIO used to control the power down line of this device.
Expand Down
8 changes: 8 additions & 0 deletions Documentation/devicetree/bindings/display/bridge/ps8640.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ properties:
Documentation/devicetree/bindings/media/video-interfaces.txt
Documentation/devicetree/bindings/graph.txt
properties:
'#address-cells':
const: 1

'#size-cells':
const: 0

port@0:
type: object
description: |
Expand All @@ -63,6 +69,8 @@ properties:
required:
- port@0

additionalProperties: false

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/display/bridge/simple-bridge.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Transparent non-programmable DRM bridges

maintainers:
- Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
- Maxime Ripard <mripard@kernel.org>

description: |
This binding supports transparent non-programmable bridges that don't require
any configuration, with a single input and a single output.
properties:
compatible:
oneOf:
- items:
- enum:
- ti,ths8134a
- ti,ths8134b
- const: ti,ths8134
- enum:
- adi,adv7123
- dumb-vga-dac
- ti,opa362
- ti,ths8134
- ti,ths8135

ports:
type: object
description: |
This device has two video ports. Their connections are modeled using the
OF graph bindings specified in Documentation/devicetree/bindings/graph.txt.
properties:
'#address-cells':
const: 1

'#size-cells':
const: 0

port@0:
type: object
description: The bridge input

port@1:
type: object
description: The bridge output

required:
- port@0
- port@1

additionalProperties: false

enable-gpios:
maxItems: 1
description: GPIO controlling bridge enable

vdd-supply:
maxItems: 1
description: Power supply for the bridge

required:
- compatible
- ports

additionalProperties: false

examples:
- |
bridge {
compatible = "ti,ths8134a", "ti,ths8134";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
vga_bridge_in: endpoint {
remote-endpoint = <&tcon0_out_vga>;
};
};
port@1 {
reg = <1>;
vga_bridge_out: endpoint {
remote-endpoint = <&vga_con_in>;
};
};
};
};
...

This file was deleted.

Loading

0 comments on commit 80c9b58

Please sign in to comment.