2017-06-08 15:31:31

by Neil Armstrong

[permalink] [raw]
Subject: [PATCH 0/4] ARM64: dts: meson-gx: Add HDMI and CVBS nodes for selected boards

Add the CVBS and HDMI nodes for the following boards :
- Wetek Play2
- Khadas VIM
- Amlogic P230 Reference board
- Amlogic P212 Reference board

Neil Armstrong (4):
ARM64: dts: meson-gxbb-wetek-play2: Add HDMI and CVBS Nodes
ARM64: dts: meson-gxl-s905d-p230: Add HDMI nodes
ARM64: dts: meson-gxl-s905x-khadas-vim: Add HDMI nodes
ARM64: dts: meson-gxl-s905x-p212: Add HDMI and CVBS nodes

.../boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 40 ++++++++++++++++++++++
.../boot/dts/amlogic/meson-gxl-s905d-p230.dts | 24 +++++++++++++
.../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 23 +++++++++++++
.../boot/dts/amlogic/meson-gxl-s905x-p212.dts | 23 +++++++++++++
4 files changed, 110 insertions(+)

--
1.9.1


2017-06-08 15:31:37

by Neil Armstrong

[permalink] [raw]
Subject: [PATCH 2/4] ARM64: dts: meson-gxl-s905d-p230: Add HDMI nodes

Add HDMI nodes for the Amlogic P230 board.

Signed-off-by: Neil Armstrong <[email protected]>
---
.../boot/dts/amlogic/meson-gxl-s905d-p230.dts | 24 ++++++++++++++++++++++
1 file changed, 24 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
index f9fbfda..3e0c023 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
@@ -84,6 +84,17 @@
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
+
+ hdmi-connector {
+ compatible = "hdmi-connector";
+ type = "a";
+
+ port {
+ hdmi_connector_in: endpoint {
+ remote-endpoint = <&hdmi_tx_tmds_out>;
+ };
+ };
+ };
};

/* P230 has exclusive choice between internal or external PHY */
@@ -113,6 +124,19 @@
};
};

+
+&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>;
+ };
+};
+
&saradc {
status = "okay";
vref-supply = <&vddio_ao18>;
--
1.9.1

2017-06-08 15:31:36

by Neil Armstrong

[permalink] [raw]
Subject: [PATCH 3/4] ARM64: dts: meson-gxl-s905x-khadas-vim: Add HDMI nodes

Add HDMI nodes for the Khadas Vim board.

Signed-off-by: Neil Armstrong <[email protected]>
---
.../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 23 ++++++++++++++++++++++
1 file changed, 23 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
index 6a81f01..72c5a9f 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
@@ -54,6 +54,29 @@
linux,default-trigger = "default-on";
};
};
+
+ hdmi-connector {
+ compatible = "hdmi-connector";
+ type = "a";
+
+ port {
+ hdmi_connector_in: endpoint {
+ remote-endpoint = <&hdmi_tx_tmds_out>;
+ };
+ };
+ };
+};
+
+&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>;
+ };
};

&i2c_A {
--
1.9.1

2017-06-08 15:31:59

by Neil Armstrong

[permalink] [raw]
Subject: [PATCH 4/4] ARM64: dts: meson-gxl-s905x-p212: Add HDMI and CVBS nodes

Add HDMI and CVBS nodes for the Amlogic P212 reference board.

Signed-off-by: Neil Armstrong <[email protected]>
---
.../boot/dts/amlogic/meson-gxl-s905x-p212.dts | 23 ++++++++++++++++++++++
1 file changed, 23 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts
index db31e09..6ab17c1 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts
@@ -58,6 +58,17 @@
};
};
};
+
+ hdmi-connector {
+ compatible = "hdmi-connector";
+ type = "a";
+
+ port {
+ hdmi_connector_in: endpoint {
+ remote-endpoint = <&hdmi_tx_tmds_out>;
+ };
+ };
+ };
};

&cvbs_vdac_port {
@@ -66,6 +77,18 @@
};
};

+&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>;
+ };
+};
+
/* This UART is brought out to the DB9 connector */
&uart_AO {
status = "okay";
--
1.9.1

2017-06-08 15:32:20

by Neil Armstrong

[permalink] [raw]
Subject: [PATCH 1/4] ARM64: dts: meson-gxbb-wetek-play2: Add HDMI and CVBS Nodes

Add HDMI and CVBS nodes for the Wetek Play2 board.

Signed-off-by: Neil Armstrong <[email protected]>
---
.../boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 40 ++++++++++++++++++++++
1 file changed, 40 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts
index 743acb5..e76ac31 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts
@@ -85,6 +85,34 @@
gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>;
};
};
+
+ 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>;
+ };
+ };
+ };
+};
+
+
+&cvbs_vdac_port {
+ cvbs_vdac_out: endpoint {
+ remote-endpoint = <&cvbs_connector_in>;
+ };
};

&ethmac {
@@ -113,6 +141,18 @@
};
};

+&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>;
+ };
+};
+
&i2c_A {
status = "okay";
pinctrl-0 = <&i2c_a_pins>;
--
1.9.1

2017-06-09 18:39:14

by Kevin Hilman

[permalink] [raw]
Subject: Re: [PATCH 0/4] ARM64: dts: meson-gx: Add HDMI and CVBS nodes for selected boards

Neil Armstrong <[email protected]> writes:

> Add the CVBS and HDMI nodes for the following boards :
> - Wetek Play2
> - Khadas VIM
> - Amlogic P230 Reference board
> - Amlogic P212 Reference board

Applied to v4.13/dt64.

Thanks,

Kevin