arm64: zynqmp: Sync DP subsystem
Sync DP subsystem with the latest state in Xilinx U-Boot repository. This binding hasn't been approved in mainline Linux but it is much better than ancient version which this patch removes. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek
parent
0546b1ab06
commit
04437dea7c
|
|
@ -284,11 +284,15 @@
|
|||
clocks = <&zynqmp_clk AMS_REF>;
|
||||
};
|
||||
|
||||
&zynqmp_dpsub {
|
||||
clocks = <&dp_aclk>, <&zynqmp_clk DP_AUDIO_REF>, <&zynqmp_clk DP_VIDEO_REF>;
|
||||
};
|
||||
|
||||
&xlnx_dpdma {
|
||||
clocks = <&zynqmp_clk DPDMA_REF>;
|
||||
};
|
||||
|
||||
&xlnx_dp_snd_codec0 {
|
||||
&zynqmp_dp_snd_codec0 {
|
||||
clocks = <&zynqmp_clk DP_AUDIO_REF>;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -175,32 +175,23 @@
|
|||
dr_mode = "host";
|
||||
};
|
||||
|
||||
&xilinx_drm {
|
||||
&zynqmp_dpsub {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&xlnx_dp {
|
||||
&zynqmp_dp_snd_pcm0 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&xlnx_dp_sub {
|
||||
status = "okay";
|
||||
xlnx,vid-clk-pl;
|
||||
};
|
||||
|
||||
&xlnx_dp_snd_pcm0 {
|
||||
&zynqmp_dp_snd_pcm1 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&xlnx_dp_snd_pcm1 {
|
||||
&zynqmp_dp_snd_card0 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&xlnx_dp_snd_card {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&xlnx_dp_snd_codec0 {
|
||||
&zynqmp_dp_snd_codec0 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
&xlnx_dp {
|
||||
&zynqmp_dpsub {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -705,33 +705,23 @@
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
&xilinx_drm {
|
||||
status = "okay";
|
||||
clocks = <&si570_1>;
|
||||
};
|
||||
|
||||
&xlnx_dp {
|
||||
&zynqmp_dpsub {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&xlnx_dp_sub {
|
||||
status = "okay";
|
||||
xlnx,vid-clk-pl;
|
||||
};
|
||||
|
||||
&xlnx_dp_snd_pcm0 {
|
||||
&zynqmp_dp_snd_codec0 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&xlnx_dp_snd_pcm1 {
|
||||
&zynqmp_dp_snd_pcm0 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&xlnx_dp_snd_card {
|
||||
&zynqmp_dp_snd_pcm1 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&xlnx_dp_snd_codec0 {
|
||||
&zynqmp_dp_snd_card0 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -201,54 +201,6 @@
|
|||
};
|
||||
};
|
||||
|
||||
xlnx_dp_snd_card: dp_snd_card {
|
||||
compatible = "xlnx,dp-snd-card";
|
||||
status = "disabled";
|
||||
xlnx,dp-snd-pcm = <&xlnx_dp_snd_pcm0>, <&xlnx_dp_snd_pcm1>;
|
||||
xlnx,dp-snd-codec = <&xlnx_dp_snd_codec0>;
|
||||
};
|
||||
|
||||
xlnx_dp_snd_codec0: dp_snd_codec0 {
|
||||
compatible = "xlnx,dp-snd-codec";
|
||||
status = "disabled";
|
||||
clock-names = "aud_clk";
|
||||
};
|
||||
|
||||
xlnx_dp_snd_pcm0: dp_snd_pcm0 {
|
||||
compatible = "xlnx,dp-snd-pcm";
|
||||
status = "disabled";
|
||||
dmas = <&xlnx_dpdma 4>;
|
||||
dma-names = "tx";
|
||||
};
|
||||
|
||||
xlnx_dp_snd_pcm1: dp_snd_pcm1 {
|
||||
compatible = "xlnx,dp-snd-pcm";
|
||||
status = "disabled";
|
||||
dmas = <&xlnx_dpdma 5>;
|
||||
dma-names = "tx";
|
||||
};
|
||||
|
||||
xilinx_drm: xilinx_drm {
|
||||
compatible = "xlnx,drm";
|
||||
status = "disabled";
|
||||
xlnx,encoder-slave = <&xlnx_dp>;
|
||||
xlnx,connector-type = "DisplayPort";
|
||||
xlnx,dp-sub = <&xlnx_dp_sub>;
|
||||
planes {
|
||||
xlnx,pixel-format = "rgb565";
|
||||
plane0 {
|
||||
dmas = <&xlnx_dpdma 3>;
|
||||
dma-names = "dma0";
|
||||
};
|
||||
plane1 {
|
||||
dmas = <&xlnx_dpdma 0>,
|
||||
<&xlnx_dpdma 1>,
|
||||
<&xlnx_dpdma 2>;
|
||||
dma-names = "dma0", "dma1", "dma2";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
amba_apu: amba-apu@0 {
|
||||
compatible = "simple-bus";
|
||||
#address-cells = <2>;
|
||||
|
|
@ -1016,37 +968,6 @@
|
|||
};
|
||||
};
|
||||
|
||||
xlnx_dp: dp@fd4a0000 {
|
||||
compatible = "xlnx,v-dp";
|
||||
status = "disabled";
|
||||
reg = <0x0 0xfd4a0000 0x0 0x1000>;
|
||||
interrupts = <0 119 4>;
|
||||
interrupt-parent = <&gic>;
|
||||
clock-names = "aclk", "aud_clk";
|
||||
xlnx,dp-version = "v1.2";
|
||||
xlnx,max-lanes = <2>;
|
||||
xlnx,max-link-rate = <540000>;
|
||||
xlnx,max-bpc = <16>;
|
||||
xlnx,enable-ycrcb;
|
||||
xlnx,colormetry = "rgb";
|
||||
xlnx,bpc = <8>;
|
||||
xlnx,audio-chan = <2>;
|
||||
xlnx,dp-sub = <&xlnx_dp_sub>;
|
||||
xlnx,max-pclock-frequency = <300000>;
|
||||
};
|
||||
|
||||
xlnx_dp_sub: dp_sub@fd4aa000 {
|
||||
compatible = "xlnx,dp-sub";
|
||||
status = "disabled";
|
||||
reg = <0x0 0xfd4aa000 0x0 0x1000>,
|
||||
<0x0 0xfd4ab000 0x0 0x1000>,
|
||||
<0x0 0xfd4ac000 0x0 0x1000>;
|
||||
reg-names = "blend", "av_buf", "aud";
|
||||
xlnx,output-fmt = "rgb";
|
||||
xlnx,vid-fmt = "yuyv";
|
||||
xlnx,gfx-fmt = "rgb565";
|
||||
};
|
||||
|
||||
xlnx_dpdma: dma@fd4c0000 {
|
||||
compatible = "xlnx,dpdma";
|
||||
status = "disabled";
|
||||
|
|
@ -1076,5 +997,62 @@
|
|||
compatible = "xlnx,audio1";
|
||||
};
|
||||
};
|
||||
|
||||
zynqmp_dpsub: zynqmp-display@fd4a0000 {
|
||||
compatible = "xlnx,zynqmp-dpsub-1.7";
|
||||
status = "disabled";
|
||||
reg = <0x0 0xfd4a0000 0x0 0x1000>,
|
||||
<0x0 0xfd4aa000 0x0 0x1000>,
|
||||
<0x0 0xfd4ab000 0x0 0x1000>,
|
||||
<0x0 0xfd4ac000 0x0 0x1000>;
|
||||
reg-names = "dp", "blend", "av_buf", "aud";
|
||||
interrupts = <0 119 4>;
|
||||
interrupt-parent = <&gic>;
|
||||
|
||||
clock-names = "dp_apb_clk", "dp_aud_clk",
|
||||
"dp_vtc_pixel_clk_in";
|
||||
|
||||
power-domains = <&zynqmp_firmware PD_DP>;
|
||||
|
||||
vid-layer {
|
||||
dma-names = "vid0", "vid1", "vid2";
|
||||
dmas = <&xlnx_dpdma 0>,
|
||||
<&xlnx_dpdma 1>,
|
||||
<&xlnx_dpdma 2>;
|
||||
};
|
||||
|
||||
gfx-layer {
|
||||
dma-names = "gfx0";
|
||||
dmas = <&xlnx_dpdma 3>;
|
||||
};
|
||||
|
||||
/* dummy node to indicate there's no child i2c device */
|
||||
i2c-bus {
|
||||
};
|
||||
|
||||
zynqmp_dp_snd_codec0: zynqmp_dp_snd_codec0 {
|
||||
compatible = "xlnx,dp-snd-codec";
|
||||
clock-names = "aud_clk";
|
||||
};
|
||||
|
||||
zynqmp_dp_snd_pcm0: zynqmp_dp_snd_pcm0 {
|
||||
compatible = "xlnx,dp-snd-pcm";
|
||||
dmas = <&xlnx_dpdma 4>;
|
||||
dma-names = "tx";
|
||||
};
|
||||
|
||||
zynqmp_dp_snd_pcm1: zynqmp_dp_snd_pcm1 {
|
||||
compatible = "xlnx,dp-snd-pcm";
|
||||
dmas = <&xlnx_dpdma 5>;
|
||||
dma-names = "tx";
|
||||
};
|
||||
|
||||
zynqmp_dp_snd_card0: zynqmp_dp_snd_card {
|
||||
compatible = "xlnx,dp-snd-card";
|
||||
xlnx,dp-snd-pcm = <&zynqmp_dp_snd_pcm0>,
|
||||
<&zynqmp_dp_snd_pcm1>;
|
||||
xlnx,dp-snd-codec = <&zynqmp_dp_snd_codec0>;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue