Commit 6939db7e authored by Neil Armstrong's avatar Neil Armstrong Committed by Kevin Hilman

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

Add HDMI output and connector nodes.
Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
parent e9da7282
...@@ -98,6 +98,27 @@ sdio_pwrseq: sdio-pwrseq { ...@@ -98,6 +98,27 @@ sdio_pwrseq: sdio-pwrseq {
clocks = <&wifi32k>; clocks = <&wifi32k>;
clock-names = "ext_clock"; 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 */ /* This UART is brought out to the DB9 connector */
...@@ -188,3 +209,21 @@ &pwm_ef { ...@@ -188,3 +209,21 @@ &pwm_ef {
&ethmac { &ethmac {
status = "okay"; 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>;
};
};
...@@ -487,6 +487,38 @@ vpu: vpu@d0100000 { ...@@ -487,6 +487,38 @@ vpu: vpu@d0100000 {
cvbs_vdac_port: port@0 { cvbs_vdac_port: port@0 {
reg = <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>;
};
}; };
}; };
}; };
...@@ -152,6 +152,17 @@ cvbs_connector_in: endpoint { ...@@ -152,6 +152,17 @@ cvbs_connector_in: endpoint {
}; };
}; };
}; };
hdmi-connector {
compatible = "hdmi-connector";
type = "a";
port {
hdmi_connector_in: endpoint {
remote-endpoint = <&hdmi_tx_tmds_out>;
};
};
};
}; };
&uart_AO { &uart_AO {
...@@ -262,3 +273,15 @@ cvbs_vdac_out: endpoint { ...@@ -262,3 +273,15 @@ cvbs_vdac_out: endpoint {
remote-endpoint = <&cvbs_connector_in>; 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>;
};
};
...@@ -135,6 +135,17 @@ cvbs_connector_in: endpoint { ...@@ -135,6 +135,17 @@ cvbs_connector_in: endpoint {
}; };
}; };
}; };
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 */ /* This UART is brought out to the DB9 connector */
...@@ -244,3 +255,15 @@ cvbs_vdac_out: endpoint { ...@@ -244,3 +255,15 @@ cvbs_vdac_out: endpoint {
remote-endpoint = <&cvbs_connector_in>; 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>;
};
};
...@@ -620,3 +620,15 @@ &spifc { ...@@ -620,3 +620,15 @@ &spifc {
&vpu { &vpu {
compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-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";
};
...@@ -127,6 +127,17 @@ cvbs_connector_in: endpoint { ...@@ -127,6 +127,17 @@ cvbs_connector_in: endpoint {
}; };
}; };
}; };
hdmi-connector {
compatible = "hdmi-connector";
type = "a";
port {
hdmi_connector_in: endpoint {
remote-endpoint = <&hdmi_tx_tmds_out>;
};
};
};
}; };
&uart_AO { &uart_AO {
...@@ -219,3 +230,15 @@ cvbs_vdac_out: endpoint { ...@@ -219,3 +230,15 @@ cvbs_vdac_out: endpoint {
remote-endpoint = <&cvbs_connector_in>; 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>;
};
};
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#include "meson-gx.dtsi" #include "meson-gx.dtsi"
#include <dt-bindings/clock/gxbb-clkc.h> #include <dt-bindings/clock/gxbb-clkc.h>
#include <dt-bindings/gpio/meson-gxl-gpio.h> #include <dt-bindings/gpio/meson-gxl-gpio.h>
#include <dt-bindings/reset/amlogic,meson-gxbb-reset.h>
/ { / {
compatible = "amlogic,meson-gxl"; compatible = "amlogic,meson-gxl";
...@@ -562,3 +563,15 @@ &spifc { ...@@ -562,3 +563,15 @@ &spifc {
&vpu { &vpu {
compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-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";
};
...@@ -100,6 +100,17 @@ cvbs_connector_in: endpoint { ...@@ -100,6 +100,17 @@ cvbs_connector_in: endpoint {
}; };
}; };
}; };
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 */ /* This UART is brought out to the DB9 connector */
...@@ -185,3 +196,15 @@ cvbs_vdac_out: endpoint { ...@@ -185,3 +196,15 @@ cvbs_vdac_out: endpoint {
remote-endpoint = <&cvbs_connector_in>; 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>;
};
};
...@@ -130,3 +130,6 @@ &vpu { ...@@ -130,3 +130,6 @@ &vpu {
compatible = "amlogic,meson-gxm-vpu", "amlogic,meson-gx-vpu"; compatible = "amlogic,meson-gxm-vpu", "amlogic,meson-gx-vpu";
}; };
&hdmi_tx {
compatible = "amlogic,meson-gxm-dw-hdmi", "amlogic,meson-gx-dw-hdmi";
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment