mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson
synced 2025-09-01 06:39:05 +00:00

The DP subsystem for ZynqMP supports audio via two channels, and the DP DMA has dma-engines for those channels. For some reason the DT binding has not specified those channels, even if the picture included in xlnx,zynqmp-dpsub.yaml shows "2 x aud" DMAs. This hasn't caused any issues as the drivers have not supported audio, and has thus gone unnoticed. To make it possible to add the audio support to the driver, add the two audio DMAs to the binding. While strictly speaking this is an ABI break, there should be no regressions caused by this as we're adding new entries at the end of the dmas list, and, after the audio support has been added in "arm64: dts: zynqmp: Add DMA for DP audio", the driver will treat the audio DMAs as optional to also support the old bindings. Reviewed-by: Rob Herring (Arm) <robh@kernel.org> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> Link: https://patchwork.freedesktop.org/patch/msgid/20241023-xilinx-dp-audio-v4-1-5128881457be@ideasonboard.com
243 lines
7.0 KiB
YAML
243 lines
7.0 KiB
YAML
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
|
|
%YAML 1.2
|
|
---
|
|
$id: http://devicetree.org/schemas/display/xlnx/xlnx,zynqmp-dpsub.yaml#
|
|
$schema: http://devicetree.org/meta-schemas/core.yaml#
|
|
|
|
title: Xilinx ZynqMP DisplayPort Subsystem
|
|
|
|
description: |
|
|
The DisplayPort subsystem of Xilinx ZynqMP (Zynq UltraScale+ MPSoC)
|
|
implements the display and audio pipelines based on the DisplayPort v1.2
|
|
standard. The subsystem includes multiple functional blocks as below:
|
|
|
|
+------------------------------------------------------------+
|
|
+--------+ | +----------------+ +-----------+ |
|
|
| DPDMA | --->| | --> | Video | Video +-------------+ |
|
|
| 4x vid | | | | | Rendering | -+--> | | | +------+
|
|
| 2x aud | | | Audio/Video | --> | Pipeline | | | DisplayPort |---> | PHY0 |
|
|
+--------+ | | Buffer Manager | +-----------+ | | Source | | +------+
|
|
| | and STC | +-----------+ | | Controller | | +------+
|
|
Live Video --->| | --> | Audio | Audio | |---> | PHY1 |
|
|
| | | | Mixer | --+-> | | | +------+
|
|
Live Audio --->| | --> | | || +-------------+ |
|
|
| +----------------+ +-----------+ || |
|
|
+---------------------------------------||-------------------+
|
|
vv
|
|
Blended Video and
|
|
Mixed Audio to PL
|
|
|
|
The Buffer Manager interacts with external interface such as DMA engines or
|
|
live audio/video streams from the programmable logic. The Video Rendering
|
|
Pipeline blends the video and graphics layers and performs colorspace
|
|
conversion. The Audio Mixer mixes the incoming audio streams. The DisplayPort
|
|
Source Controller handles the DisplayPort protocol and connects to external
|
|
PHYs.
|
|
|
|
The subsystem supports 2 video and 2 audio streams, and various pixel formats
|
|
and depths up to 4K@30 resolution.
|
|
|
|
Please refer to "Zynq UltraScale+ Device Technical Reference Manual"
|
|
(https://www.xilinx.com/support/documentation/user_guides/ug1085-zynq-ultrascale-trm.pdf)
|
|
for more details.
|
|
|
|
maintainers:
|
|
- Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
|
|
properties:
|
|
compatible:
|
|
const: xlnx,zynqmp-dpsub-1.7
|
|
|
|
reg:
|
|
maxItems: 4
|
|
reg-names:
|
|
items:
|
|
- const: dp
|
|
- const: blend
|
|
- const: av_buf
|
|
- const: aud
|
|
|
|
interrupts:
|
|
maxItems: 1
|
|
|
|
clocks:
|
|
description:
|
|
The APB clock and at least one video clock are mandatory, the audio clock
|
|
is optional.
|
|
minItems: 2
|
|
items:
|
|
- description: dp_apb_clk is the APB clock
|
|
- description: dp_aud_clk is the Audio clock
|
|
- description:
|
|
dp_vtc_pixel_clk_in is the non-live video clock (from Processing
|
|
System)
|
|
- description:
|
|
dp_live_video_in_clk is the live video clock (from Programmable
|
|
Logic)
|
|
clock-names:
|
|
oneOf:
|
|
- minItems: 2
|
|
items:
|
|
- const: dp_apb_clk
|
|
- enum: [ dp_vtc_pixel_clk_in, dp_live_video_in_clk ]
|
|
- enum: [ dp_vtc_pixel_clk_in, dp_live_video_in_clk ]
|
|
- minItems: 3
|
|
items:
|
|
- const: dp_apb_clk
|
|
- const: dp_aud_clk
|
|
- enum: [ dp_vtc_pixel_clk_in, dp_live_video_in_clk ]
|
|
- enum: [ dp_vtc_pixel_clk_in, dp_live_video_in_clk ]
|
|
|
|
power-domains:
|
|
maxItems: 1
|
|
|
|
resets:
|
|
maxItems: 1
|
|
|
|
dmas:
|
|
items:
|
|
- description: Video layer, plane 0 (RGB or luma)
|
|
- description: Video layer, plane 1 (U/V or U)
|
|
- description: Video layer, plane 2 (V)
|
|
- description: Graphics layer
|
|
- description: Audio channel 0
|
|
- description: Audio channel 1
|
|
dma-names:
|
|
items:
|
|
- const: vid0
|
|
- const: vid1
|
|
- const: vid2
|
|
- const: gfx0
|
|
- const: aud0
|
|
- const: aud1
|
|
|
|
phys:
|
|
description: PHYs for the DP data lanes
|
|
minItems: 1
|
|
maxItems: 2
|
|
phy-names:
|
|
minItems: 1
|
|
items:
|
|
- const: dp-phy0
|
|
- const: dp-phy1
|
|
|
|
ports:
|
|
$ref: /schemas/graph.yaml#/properties/ports
|
|
description: |
|
|
Connections to the programmable logic and the DisplayPort PHYs. Each port
|
|
shall have a single endpoint.
|
|
|
|
properties:
|
|
port@0:
|
|
$ref: /schemas/graph.yaml#/properties/port
|
|
description: The live video input from the programmable logic
|
|
|
|
port@1:
|
|
$ref: /schemas/graph.yaml#/properties/port
|
|
description: The live graphics input from the programmable logic
|
|
|
|
port@2:
|
|
$ref: /schemas/graph.yaml#/properties/port
|
|
description: The live audio input from the programmable logic
|
|
|
|
port@3:
|
|
$ref: /schemas/graph.yaml#/properties/port
|
|
description: The blended video output to the programmable logic
|
|
|
|
port@4:
|
|
$ref: /schemas/graph.yaml#/properties/port
|
|
description: The mixed audio output to the programmable logic
|
|
|
|
port@5:
|
|
$ref: /schemas/graph.yaml#/properties/port
|
|
description: The DisplayPort output
|
|
|
|
required:
|
|
- port@0
|
|
- port@1
|
|
- port@2
|
|
- port@3
|
|
- port@4
|
|
- port@5
|
|
|
|
required:
|
|
- compatible
|
|
- reg
|
|
- reg-names
|
|
- interrupts
|
|
- clocks
|
|
- clock-names
|
|
- power-domains
|
|
- resets
|
|
- dmas
|
|
- dma-names
|
|
- phys
|
|
- phy-names
|
|
- ports
|
|
|
|
additionalProperties: false
|
|
|
|
examples:
|
|
- |
|
|
#include <dt-bindings/phy/phy.h>
|
|
#include <dt-bindings/reset/xlnx-zynqmp-resets.h>
|
|
|
|
display@fd4a0000 {
|
|
compatible = "xlnx,zynqmp-dpsub-1.7";
|
|
reg = <0xfd4a0000 0x1000>,
|
|
<0xfd4aa000 0x1000>,
|
|
<0xfd4ab000 0x1000>,
|
|
<0xfd4ac000 0x1000>;
|
|
reg-names = "dp", "blend", "av_buf", "aud";
|
|
interrupts = <0 119 4>;
|
|
interrupt-parent = <&gic>;
|
|
|
|
clock-names = "dp_apb_clk", "dp_aud_clk", "dp_live_video_in_clk";
|
|
clocks = <&dp_aclk>, <&clkc 17>, <&si570_1>;
|
|
|
|
power-domains = <&pd_dp>;
|
|
resets = <&reset ZYNQMP_RESET_DP>;
|
|
|
|
dma-names = "vid0", "vid1", "vid2", "gfx0", "aud0", "aud1";
|
|
dmas = <&xlnx_dpdma 0>,
|
|
<&xlnx_dpdma 1>,
|
|
<&xlnx_dpdma 2>,
|
|
<&xlnx_dpdma 3>,
|
|
<&xlnx_dpdma 4>,
|
|
<&xlnx_dpdma 5>;
|
|
|
|
phys = <&psgtr 1 PHY_TYPE_DP 0 3>,
|
|
<&psgtr 0 PHY_TYPE_DP 1 3>;
|
|
|
|
phy-names = "dp-phy0", "dp-phy1";
|
|
|
|
ports {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
|
|
port@0 {
|
|
reg = <0>;
|
|
};
|
|
port@1 {
|
|
reg = <1>;
|
|
};
|
|
port@2 {
|
|
reg = <2>;
|
|
};
|
|
port@3 {
|
|
reg = <3>;
|
|
};
|
|
port@4 {
|
|
reg = <4>;
|
|
};
|
|
port@5 {
|
|
reg = <5>;
|
|
dpsub_dp_out: endpoint {
|
|
remote-endpoint = <&dp_connector>;
|
|
};
|
|
};
|
|
};
|
|
};
|
|
|
|
...
|