[PATCH 14/17] ARM: dts: sun8i: r40: Add missing TCON-TOP - TCON connections

Jernej Skrabec
2018-07-06T17:51:10Z

Current R40 is missing some graph connections between TCON TOP and
TCONs.

Add them.

Fixes: 05a43a262d03 ("ARM: dts: sun8i: r40: Add HDMI pipeline")

Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
---
.../boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 20 ---------
arch/arm/boot/dts/sun8i-r40.dtsi | 44 +++++++++++++++++++
2 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts b/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts
index 4f3d583183dc..737cf01b1acd 100644
--- a/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts
+++ b/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts
@@ -251,26 +251,6 @@
regulator-name = "vcc-wifi";
};

-&tcon_top_hdmi_in_tcon_tv0 {
- remote-endpoint = <&tcon_tv0_out_tcon_top>;
-};
-
-&tcon_top_mixer0_out_tcon_tv0 {
- remote-endpoint = <&tcon_tv0_in_tcon_top>;
-};
-
-&tcon_tv0_in {
- tcon_tv0_in_tcon_top: endpoint {
- remote-endpoint = <&tcon_top_mixer0_out_tcon_tv0>;
- };
-};
-
-&tcon_tv0_out {
- tcon_tv0_out_tcon_top: endpoint {
- remote-endpoint = <&tcon_top_hdmi_in_tcon_tv0>;
- };
-};
-
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pb_pins>;
diff --git a/arch/arm/boot/dts/sun8i-r40.dtsi b/arch/arm/boot/dts/sun8i-r40.dtsi
index 6b4fe8eeee99..e5c7e4804384 100644
--- a/arch/arm/boot/dts/sun8i-r40.dtsi
+++ b/arch/arm/boot/dts/sun8i-r40.dtsi
@@ -601,10 +601,12 @@

tcon_top_mixer0_out_tcon_tv0: endpoint at 2 {
reg = <2>;
+ remote-endpoint = <&tcon_tv0_in_tcon_top_mixer0>;
};

tcon_top_mixer0_out_tcon_tv1: endpoint at 3 {
reg = <3>;
+ remote-endpoint = <&tcon_tv1_in_tcon_top_mixer0>;
};
};

@@ -634,10 +636,12 @@

tcon_top_mixer1_out_tcon_tv0: endpoint at 2 {
reg = <2>;
+ remote-endpoint = <&tcon_tv0_in_tcon_top_mixer1>;
};

tcon_top_mixer1_out_tcon_tv1: endpoint at 3 {
reg = <3>;
+ remote-endpoint = <&tcon_tv1_in_tcon_top_mixer1>;
};
};

@@ -648,10 +652,12 @@

tcon_top_hdmi_in_tcon_tv0: endpoint at 0 {
reg = <0>;
+ remote-endpoint = <&tcon_tv0_out_tcon_top>;
};

tcon_top_hdmi_in_tcon_tv1: endpoint at 1 {
reg = <1>;
+ remote-endpoint = <&tcon_tv1_out_tcon_top>;
};
};

@@ -679,11 +685,30 @@
#size-cells = <0>;

tcon_tv0_in: port at 0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
reg = <0>;
+
+ tcon_tv0_in_tcon_top_mixer0: endpoint at 0 {
+ reg = <0>;
+ remote-endpoint = <&tcon_top_mixer0_out_tcon_tv0>;
+ };
+
+ tcon_tv0_in_tcon_top_mixer1: endpoint at 1 {
+ reg = <1>;
+ remote-endpoint = <&tcon_top_mixer1_out_tcon_tv0>;
+ };
};

tcon_tv0_out: port at 1 {
+ #address-cells = <1>;
+ #size-cells = <0>;
reg = <1>;
+
+ tcon_tv0_out_tcon_top: endpoint at 1 {
+ reg = <1>;
+ remote-endpoint = <&tcon_top_hdmi_in_tcon_tv0>;
+ };
};
};
};
@@ -702,11 +727,30 @@
#size-cells = <0>;

tcon_tv1_in: port at 0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
reg = <0>;
+
+ tcon_tv1_in_tcon_top_mixer0: endpoint at 0 {
+ reg = <0>;
+ remote-endpoint = <&tcon_top_mixer0_out_tcon_tv1>;
+ };
+
+ tcon_tv1_in_tcon_top_mixer1: endpoint at 1 {
+ reg = <1>;
+ remote-endpoint = <&tcon_top_mixer1_out_tcon_tv1>;
+ };
};

tcon_tv1_out: port at 1 {
+ #address-cells = <1>;
+ #size-cells = <0>;
reg = <1>;
+
+ tcon_tv1_out_tcon_top: endpoint at 1 {
+ reg = <1>;
+ remote-endpoint = <&tcon_top_hdmi_in_tcon_tv1>;
+ };
};
};
};
--
2.18.0