-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'drm-next-20210322' of git://linuxtv.org/pinchartl/media in…
…to drm-next Conversion of misc display DT bindings to YAML Signed-off-by: Dave Airlie <airlied@redhat.com> From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Link: https://patchwork.freedesktop.org/patch/msgid/YFgOFL/yMUkyxqK3@pendragon.ideasonboard.com
- Loading branch information
Showing
12 changed files
with
1,297 additions
and
409 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 0 additions & 33 deletions
33
Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt
This file was deleted.
Oops, something went wrong.
88 changes: 0 additions & 88 deletions
88
Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt
This file was deleted.
Oops, something went wrong.
125 changes: 125 additions & 0 deletions
125
Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,125 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/display/bridge/renesas,dw-hdmi.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Renesas R-Car DWC HDMI TX Encoder | ||
|
||
maintainers: | ||
- Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | ||
|
||
description: | | ||
The HDMI transmitter is a Synopsys DesignWare HDMI 1.4 TX controller IP | ||
with a companion PHY IP. | ||
allOf: | ||
- $ref: synopsys,dw-hdmi.yaml# | ||
|
||
properties: | ||
compatible: | ||
items: | ||
- enum: | ||
- renesas,r8a774a1-hdmi # for RZ/G2M compatible HDMI TX | ||
- renesas,r8a774b1-hdmi # for RZ/G2N compatible HDMI TX | ||
- renesas,r8a774e1-hdmi # for RZ/G2H compatible HDMI TX | ||
- renesas,r8a7795-hdmi # for R-Car H3 compatible HDMI TX | ||
- renesas,r8a7796-hdmi # for R-Car M3-W compatible HDMI TX | ||
- renesas,r8a77961-hdmi # for R-Car M3-W+ compatible HDMI TX | ||
- renesas,r8a77965-hdmi # for R-Car M3-N compatible HDMI TX | ||
- const: renesas,rcar-gen3-hdmi | ||
|
||
reg-io-width: | ||
const: 1 | ||
|
||
clocks: | ||
maxItems: 2 | ||
|
||
clock-names: | ||
maxItems: 2 | ||
|
||
ports: | ||
$ref: /schemas/graph.yaml#/properties/ports | ||
|
||
properties: | ||
port@0: | ||
$ref: /schemas/graph.yaml#/properties/port | ||
description: Parallel RGB input port | ||
|
||
port@1: | ||
$ref: /schemas/graph.yaml#/properties/port | ||
description: HDMI output port | ||
|
||
port@2: | ||
$ref: /schemas/graph.yaml#/properties/port | ||
description: Sound input port | ||
|
||
required: | ||
- port@0 | ||
- port@1 | ||
- port@2 | ||
|
||
power-domains: | ||
maxItems: 1 | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- clocks | ||
- clock-names | ||
- interrupts | ||
- ports | ||
|
||
unevaluatedProperties: false | ||
|
||
examples: | ||
- | | ||
#include <dt-bindings/clock/r8a7795-cpg-mssr.h> | ||
#include <dt-bindings/interrupt-controller/irq.h> | ||
#include <dt-bindings/power/r8a7795-sysc.h> | ||
hdmi@fead0000 { | ||
compatible = "renesas,r8a7795-hdmi", "renesas,rcar-gen3-hdmi"; | ||
reg = <0xfead0000 0x10000>; | ||
interrupts = <0 389 IRQ_TYPE_LEVEL_HIGH>; | ||
clocks = <&cpg CPG_CORE R8A7795_CLK_S0D4>, <&cpg CPG_MOD 729>; | ||
clock-names = "iahb", "isfr"; | ||
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; | ||
ports { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
port@0 { | ||
reg = <0>; | ||
dw_hdmi0_in: endpoint { | ||
remote-endpoint = <&du_out_hdmi0>; | ||
}; | ||
}; | ||
port@1 { | ||
reg = <1>; | ||
rcar_dw_hdmi0_out: endpoint { | ||
remote-endpoint = <&hdmi0_con>; | ||
}; | ||
}; | ||
port@2 { | ||
reg = <2>; | ||
rcar_dw_hdmi0_sound_in: endpoint { | ||
remote-endpoint = <&hdmi_sound_out>; | ||
}; | ||
}; | ||
}; | ||
}; | ||
hdmi0-out { | ||
compatible = "hdmi-connector"; | ||
label = "HDMI0 OUT"; | ||
type = "a"; | ||
port { | ||
hdmi0_con: endpoint { | ||
remote-endpoint = <&rcar_dw_hdmi0_out>; | ||
}; | ||
}; | ||
}; | ||
... |
55 changes: 55 additions & 0 deletions
55
Documentation/devicetree/bindings/display/bridge/synopsys,dw-hdmi.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/display/bridge/synopsys,dw-hdmi.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Common Properties for Synopsys DesignWare HDMI TX Controller | ||
|
||
maintainers: | ||
- Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | ||
|
||
description: | | ||
This document defines device tree properties for the Synopsys DesignWare HDMI | ||
TX controller (DWC HDMI TX) IP core. It doesn't constitute a full device tree | ||
binding specification by itself but is meant to be referenced by device tree | ||
bindings for the platform-specific integrations of the DWC HDMI TX. | ||
When referenced from platform device tree bindings the properties defined in | ||
this document are defined as follows. The platform device tree bindings are | ||
responsible for defining whether each property is required or optional. | ||
properties: | ||
reg: | ||
maxItems: 1 | ||
|
||
reg-io-width: | ||
description: | ||
Width (in bytes) of the registers specified by the reg property. | ||
allOf: | ||
- $ref: /schemas/types.yaml#/definitions/uint32 | ||
- enum: [1, 4] | ||
default: 1 | ||
|
||
clocks: | ||
minItems: 2 | ||
maxItems: 5 | ||
items: | ||
- description: The bus clock for either AHB and APB | ||
- description: The internal register configuration clock | ||
additionalItems: true | ||
|
||
clock-names: | ||
minItems: 2 | ||
maxItems: 5 | ||
items: | ||
- const: iahb | ||
- const: isfr | ||
additionalItems: true | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
additionalProperties: true | ||
|
||
... |
Oops, something went wrong.