ARM64: dts: meson-gx: Add support for HDMI output

Add HDMI output and connector nodes.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>

9 files changed, 191 insertions, 0 deletions

diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
index 7a078bef04cd..a84e27622639 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
@@ -98,6 +98,27 @@
                 clocks = <&wifi32k>;
                 clock-names = "ext_clock";
         };
+
+        cvbs-connector {
+                compatible = "composite-video-connector";
+
+                port {
+                        cvbs_connector_in: endpoint {
+                                remote-endpoint = <&cvbs_vdac_out>;
+                        };
+                };
+        };
+
+        hdmi-connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_connector_in: endpoint {
+                                remote-endpoint = <&hdmi_tx_tmds_out>;
+                        };
+                };
+        };
 };
 
 /* This UART is brought out to the DB9 connector */
@@ -188,3 +209,21 @@
 &ethmac {
         status = "okay";
 };
+
+&cvbs_vdac_port {
+        cvbs_vdac_out: endpoint {
+                remote-endpoint = <&cvbs_connector_in>;
+        };
+};
+
+&hdmi_tx {
+        status = "okay";
+        pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
+        pinctrl-names = "default";
+};
+
+&hdmi_tx_tmds_port {
+        hdmi_tx_tmds_out: endpoint {
+                remote-endpoint = <&hdmi_connector_in>;
+        };
+};
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
index 8d797e8b7658..358eef97ec95 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
@@ -487,6 +487,38 @@
                         cvbs_vdac_port: port@0 {
                                 reg = <0>;
                         };
+
+                        /* HDMI-TX output port */
+                        hdmi_tx_port: port@1 {
+                                reg = <1>;
+
+                                hdmi_tx_out: endpoint {
+                                        remote-endpoint = <&hdmi_tx_in>;
+                                };
+                        };
+                };
+
+                hdmi_tx: hdmi-tx@c883a000 {
+                        compatible = "amlogic,meson-gx-dw-hdmi";
+                        reg = <0x0 0xc883a000 0x0 0x1c>;
+                        interrupts = <GIC_SPI 57 IRQ_TYPE_EDGE_RISING>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+
+                        /* VPU VENC Input */
+                        hdmi_tx_venc_port: port@0 {
+                                reg = <0>;
+
+                                hdmi_tx_in: endpoint {
+                                        remote-endpoint = <&hdmi_tx_out>;
+                                };
+                        };
+
+                        /* TMDS Output */
+                        hdmi_tx_tmds_port: port@1 {
+                                reg = <1>;
+                        };
                 };
         };
 };
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
index dbfa441f479e..87198eafb04b 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
@@ -152,6 +152,17 @@
                         };
                 };
         };
+
+        hdmi-connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_connector_in: endpoint {
+                                remote-endpoint = <&hdmi_tx_tmds_out>;
+                        };
+                };
+        };
 };
 
 &uart_AO {
@@ -262,3 +273,15 @@
                 remote-endpoint = <&cvbs_connector_in>;
         };
 };
+
+&hdmi_tx {
+        status = "okay";
+        pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
+        pinctrl-names = "default";
+};
+
+&hdmi_tx_tmds_port {
+        hdmi_tx_tmds_out: endpoint {
+                remote-endpoint = <&hdmi_connector_in>;
+        };
+};
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
index 17ebe46e48d4..3c6c0b7f4187 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
@@ -135,6 +135,17 @@
                         };
                 };
         };
+
+        hdmi-connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_connector_in: endpoint {
+                                remote-endpoint = <&hdmi_tx_tmds_out>;
+                        };
+                };
+        };
 };
 
 /* This UART is brought out to the DB9 connector */
@@ -244,3 +255,15 @@
                 remote-endpoint = <&cvbs_connector_in>;
         };
 };
+
+&hdmi_tx {
+        status = "okay";
+        pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
+        pinctrl-names = "default";
+};
+
+&hdmi_tx_tmds_port {
+        hdmi_tx_tmds_out: endpoint {
+                remote-endpoint = <&hdmi_connector_in>;
+        };
+};
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
index b56732f4defb..4afe1c46ec11 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@ -620,3 +620,15 @@
 &vpu {
         compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu";
 };
+
+&hdmi_tx {
+        compatible = "amlogic,meson-gxbb-dw-hdmi", "amlogic,meson-gx-dw-hdmi";
+        resets = <&reset RESET_HDMITX_CAPB3>,
+                 <&reset RESET_HDMI_SYSTEM_RESET>,
+                 <&reset RESET_HDMI_TX>;
+        reset-names = "hdmitx_apb", "hdmitx", "hdmitx_phy";
+        clocks = <&clkc CLKID_HDMI_PCLK>,
+                 <&clkc CLKID_CLK81>,
+                 <&clkc CLKID_GCLK_VENCI_INT0>;
+        clock-names = "isfr", "iahb", "venci";
+};
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts
index cea4a3eded9b..8873c058fad2 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts
@@ -127,6 +127,17 @@
                         };
                 };
         };
+
+        hdmi-connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_connector_in: endpoint {
+                                remote-endpoint = <&hdmi_tx_tmds_out>;
+                        };
+                };
+        };
 };
 
 &uart_AO {
@@ -219,3 +230,15 @@
                 remote-endpoint = <&cvbs_connector_in>;
         };
 };
+
+&hdmi_tx {
+        status = "okay";
+        pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
+        pinctrl-names = "default";
+};
+
+&hdmi_tx_tmds_port {
+        hdmi_tx_tmds_out: endpoint {
+                remote-endpoint = <&hdmi_connector_in>;
+        };
+};
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
index f24981a90e87..d8e096dff10a 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
@@ -44,6 +44,7 @@
 #include "meson-gx.dtsi"
 #include <dt-bindings/clock/gxbb-clkc.h>
 #include <dt-bindings/gpio/meson-gxl-gpio.h>
+#include <dt-bindings/reset/amlogic,meson-gxbb-reset.h>
 
 / {
         compatible = "amlogic,meson-gxl";
@@ -562,3 +563,15 @@
 &vpu {
         compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-vpu";
 };
+
+&hdmi_tx {
+        compatible = "amlogic,meson-gxl-dw-hdmi", "amlogic,meson-gx-dw-hdmi";
+        resets = <&reset RESET_HDMITX_CAPB3>,
+                 <&reset RESET_HDMI_SYSTEM_RESET>,
+                 <&reset RESET_HDMI_TX>;
+        reset-names = "hdmitx_apb", "hdmitx", "hdmitx_phy";
+        clocks = <&clkc CLKID_HDMI_PCLK>,
+                 <&clkc CLKID_CLK81>,
+                 <&clkc CLKID_GCLK_VENCI_INT0>;
+        clock-names = "isfr", "iahb", "venci";
+};
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
index a0bc746adb42..11b0bf46a95c 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
@@ -100,6 +100,17 @@
                         };
                 };
         };
+
+        hdmi-connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_connector_in: endpoint {
+                                remote-endpoint = <&hdmi_tx_tmds_out>;
+                        };
+                };
+        };
 };
 
 /* This UART is brought out to the DB9 connector */
@@ -185,3 +196,15 @@
                 remote-endpoint = <&cvbs_connector_in>;
         };
 };
+
+&hdmi_tx {
+        status = "okay";
+        pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
+        pinctrl-names = "default";
+};
+
+&hdmi_tx_tmds_port {
+        hdmi_tx_tmds_out: endpoint {
+                remote-endpoint = <&hdmi_connector_in>;
+        };
+};
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
index ddea7305c644..fe451cce93e7 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
@@ -130,3 +130,6 @@
         compatible = "amlogic,meson-gxm-vpu", "amlogic,meson-gx-vpu";
 };
 
+&hdmi_tx {
+        compatible = "amlogic,meson-gxm-dw-hdmi", "amlogic,meson-gx-dw-hdmi";
+};