The HDMI TX Parallel Audio Interface (HTX_PAI) is a digital module that
acts as the bridge between the Audio Subsystem to the HDMI TX Controller.
Correct the register map of hdmi_pvi, which is overlapped with the
hdmi_pai device.
Signed-off-by: Shengjiu Wang <shengjiu.w...@nxp.com>
---
arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 4 +++
arch/arm64/boot/dts/freescale/imx8mp.dtsi | 26 +++++++++++++++++++-
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-evk.dts
b/arch/arm64/boot/dts/freescale/imx8mp-evk.dts
index c0cc5611048e..cc9351a5bd65 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-evk.dts
@@ -442,6 +442,10 @@ &flexcan2 {
status = "disabled";/* can2 pin conflict with pdm */
};
+&hdmi_pai {
+ status = "okay";
+};
+
&hdmi_pvi {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi
b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
index bb24dba7338e..6e5a41f46309 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
@@ -2063,7 +2063,7 @@ irqsteer_hdmi: interrupt-controller@32fc2000 {
hdmi_pvi: display-bridge@32fc4000 {
compatible = "fsl,imx8mp-hdmi-pvi";
- reg = <0x32fc4000 0x1000>;
+ reg = <0x32fc4000 0x800>;
interrupt-parent = <&irqsteer_hdmi>;
interrupts = <12>;
power-domains = <&hdmi_blk_ctrl
IMX8MP_HDMIBLK_PD_PVI>;
@@ -2089,6 +2089,22 @@ pvi_to_hdmi_tx: endpoint {
};
};
+ hdmi_pai: hdmi@32fc4800 {
+ compatible = "fsl,imx8mp-hdmi-pai";
+ reg = <0x32fc4800 0x800>;
+ interrupt-parent = <&irqsteer_hdmi>;
+ interrupts = <14>;
+ power-domains = <&hdmi_blk_ctrl
IMX8MP_HDMIBLK_PD_PAI>;
+ status = "disabled";
+
+ port {
+
+ pai_to_hdmi_tx: endpoint {
+ remote-endpoint =
<&hdmi_tx_from_pai>;
+ };
+ };
+ };
+
lcdif3: display-controller@32fc6000 {
compatible = "fsl,imx8mp-lcdif";
reg = <0x32fc6000 0x1000>;
@@ -2140,6 +2156,14 @@ port@1 {
reg = <1>;
/* Point endpoint to the HDMI
connector */
};
+
+ port@2 {
+ reg = <2>;
+
+ hdmi_tx_from_pai: endpoint {
+ remote-endpoint =
<&pai_to_hdmi_tx>;
+ };
+ };
};
};
--
2.34.1
