LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Jagan Teki <jagan@amarulasolutions.com>
To: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Chen-Yu Tsai <wens@csie.org>, Icenowy Zheng <icenowy@aosc.io>,
	Jernej Skrabec <jernej.skrabec@siol.net>,
	Rob Herring <robh+dt@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	Michael Trimarchi <michael@amarulasolutions.com>,
	linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com,
	Jagan Teki <jagan@amarulasolutions.com>
Subject: [RFC 12/13] arm64: dts: allwinner: a64: Add HDMI pipeline
Date: Tue, 24 Apr 2018 19:04:24 +0530	[thread overview]
Message-ID: <20180424133425.24291-13-jagan@amarulasolutions.com> (raw)
In-Reply-To: <20180424133425.24291-1-jagan@amarulasolutions.com>

HDMI pipeline on A64 has similar behavior like A83T where
tcon1 is connected to HDMI. So reuse similar dts nodes for A64.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 79 ++++++++++++++++++++++++++-
 1 file changed, 78 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index aa73f1ce1ab2..56e06e504d5f 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -109,7 +109,7 @@
 
 	de: display-engine {
 		compatible = "allwinner,sun50i-a64-display-engine";
-		allwinner,pipelines = <&mixer0>;
+		allwinner,pipelines = <&mixer0>, <&mixer1>;
 		status = "disabled";
 	};
 
@@ -213,6 +213,31 @@
 			};
 		};
 
+		mixer1: mixer@1200000 {
+			compatible = "allwinner,sun50i-a64-de2-mixer-1",
+				     "allwinner,sun8i-a83t-de2-mixer-1";
+			reg = <0x01200000 0x100000>;
+			clocks = <&display_clocks CLK_BUS_MIXER1>,
+				 <&display_clocks CLK_MIXER1>;
+			clock-names = "bus",
+				      "mod";
+			resets = <&display_clocks RST_WB>;
+
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				mixer1_out: port@1 {
+					reg = <1>;
+
+					mixer1_out_tcon1: endpoint {
+						remote-endpoint = <&tcon1_in_mixer1>;
+					};
+				};
+			};
+		};
+
+
 		syscon: syscon@1c00000 {
 			compatible = "allwinner,sun50i-a64-system-controller",
 				"syscon";
@@ -261,6 +286,41 @@
 			};
 		};
 
+		tcon1: lcd-controller@1c0d000 {
+			compatible = "allwinner,sun50i-a64-tcon-tv",
+				     "allwinner,sun8i-a83t-tcon-tv";
+			reg = <0x01c0d000 0x1000>;
+			interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&ccu CLK_BUS_TCON1>, <&ccu CLK_TCON1>;
+			clock-names = "ahb", "tcon-ch1";
+			resets = <&ccu RST_BUS_TCON1>;
+			reset-names = "lcd";
+
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				tcon1_in: port@0 {
+					reg = <0>;
+
+					tcon1_in_mixer1: endpoint {
+						remote-endpoint = <&mixer1_out_tcon1>;
+					};
+				};
+
+				tcon1_out: port@1 {
+					#address-cells = <1>;
+					#size-cells = <0>;
+					reg = <1>;
+
+					tcon1_out_hdmi: endpoint@1 {
+						reg = <1>;
+						remote-endpoint = <&hdmi_in_tcon1>;
+					};
+				};
+			};
+		};
+
 		mmc0: mmc@1c0f000 {
 			compatible = "allwinner,sun50i-a64-mmc";
 			reg = <0x01c0f000 0x1000>;
@@ -719,6 +779,23 @@
 			phys = <&hdmi_phy>;
 			phy-names = "hdmi-phy";
 			status = "disabled";
+
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				hdmi_in: port@0 {
+					reg = <0>;
+
+					hdmi_in_tcon1: endpoint {
+						remote-endpoint = <&tcon1_out_hdmi>;
+					};
+				};
+
+				hdmi_out: port@1 {
+					reg = <1>;
+				};
+			};
 		};
 
 		hdmi_phy: hdmi-phy@1ef0000 {
-- 
2.14.3

  parent reply	other threads:[~2018-04-24 13:36 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-24 13:34 [RFC 00/13] arm64: allwinner: Add A64 DE2 pipeline support Jagan Teki
2018-04-24 13:34 ` [RFC 01/13] dt-bindings: clock: Add compatible for A64 DE2 CCU Jagan Teki
2018-04-24 13:34 ` [RFC 02/13] arm64: dts: allwinner: a64: Add " Jagan Teki
2018-04-24 13:34 ` [RFC 03/13] bindings: display: Add compatible for A64 DE2 pipeline Jagan Teki
2018-04-24 13:37   ` Chen-Yu Tsai
2018-04-24 13:34 ` [RFC 04/13] bindings: display: Add compatible for A64 Mixer0 Jagan Teki
2018-04-24 13:34 ` [RFC 05/13] bindings: display: Add compatible for A64 tcon-lcd Jagan Teki
2018-04-24 13:34 ` [RFC 06/13] arm64: dts: allwinner: a64: Add DE2 pipeline Jagan Teki
2018-04-24 13:34 ` [RFC 07/13] bindings: display: Add compatible for A64 HDMI Jagan Teki
2018-04-24 13:34 ` [RFC 08/13] bindings: display: Add compatible for A64 HDMI PHY Jagan Teki
2018-04-24 13:34 ` [RFC 09/13] arm64: dts: allwinner: a64: Add HDMI support Jagan Teki
2018-04-24 15:27   ` Jernej Škrabec
2018-04-24 13:34 ` [RFC 10/13] bindings: display: Add compatible for A64 Mixer1 Jagan Teki
2018-04-24 13:34 ` [RFC 11/13] bindings: display: Add compatible for A64 tcon-tv Jagan Teki
2018-04-24 13:34 ` Jagan Teki [this message]
2018-04-24 13:34 ` [RFC 13/13] arm64: dts: allwinner: a64: bananapi-m64: Enable HDMI output Jagan Teki
2018-04-24 14:08 ` [RFC 00/13] arm64: allwinner: Add A64 DE2 pipeline support Maxime Ripard
2018-04-25 12:59   ` Jagan Teki
2018-04-25 13:55     ` Maxime Ripard
2018-04-25 18:06       ` Jernej Škrabec
2018-04-24 15:32 ` Jernej Škrabec
2018-04-25 10:34   ` Jagan Teki
2018-04-25 17:59     ` Jernej Škrabec
2018-04-26 13:26       ` Jagan Teki
2018-04-26 22:13         ` Jernej Škrabec

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180424133425.24291-13-jagan@amarulasolutions.com \
    --to=jagan@amarulasolutions.com \
    --cc=catalin.marinas@arm.com \
    --cc=devicetree@vger.kernel.org \
    --cc=icenowy@aosc.io \
    --cc=jernej.skrabec@siol.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sunxi@googlegroups.com \
    --cc=mark.rutland@arm.com \
    --cc=maxime.ripard@free-electrons.com \
    --cc=michael@amarulasolutions.com \
    --cc=robh+dt@kernel.org \
    --cc=wens@csie.org \
    --cc=will.deacon@arm.com \
    --subject='Re: [RFC 12/13] arm64: dts: allwinner: a64: Add HDMI pipeline' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).