From patchwork Tue Apr 24 13:34:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 10359995 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7B6D0602D6 for ; Tue, 24 Apr 2018 13:48:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 689A428DC3 for ; Tue, 24 Apr 2018 13:48:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5D4D728DA2; Tue, 24 Apr 2018 13:48:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D8E0628DC3 for ; Tue, 24 Apr 2018 13:48:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=uCBbCcmiS1FXzKQdnb6wC2JEikUIJj/0BHO0nvGQHXI=; b=iuTYw4c3ox1meTglbLDiSE40gI up5dFEqcCu98pXi/8huCfHFBcMcrliJcxs6QgszX+5n9TPiUjuYFAM5b5GhgD/2zOIWgNYn1Lw6Qo Cy7+3Srd+1WnqvLM0jDjXk/SOSbRjVnO3vJAtsPT8tGnt5FNJr19ys+4TZCQzv5AU398VHD9CuN4A jv9IiU0F7ddjMGx/engS1qBjh5BE1z6bZ4mjk/0mF6L/FG6kYpPpfGCNP/4i3DIVbqf2fHHYuuofY upP7m9m/52Rr9/MGSaPi9T4iBvgpYAdthqbhJ51W1HC4hK+saQ2u7g8HL5ugQt8Ifau61X1qdx9FE DrNd3slA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fAyIc-0005lh-4Q; Tue, 24 Apr 2018 13:48:02 +0000 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fAy6r-0006XA-Iy for linux-arm-kernel@lists.infradead.org; Tue, 24 Apr 2018 13:36:12 +0000 Received: by mail-pf0-x241.google.com with SMTP id a14so1777253pfi.1 for ; Tue, 24 Apr 2018 06:35:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=74PdnrytGEwWCHrhIeGtMiiYzkZWbDnFWAdAeE3FcWw=; b=kwfYnG/tS19gsItYHLwiWuciJLoOx1uq/fFQqFlQo2RGUX0wf+g1zrB5Fn79stsXWq vupARlu06KsQ7c5SAk5JxuL6o1N+9AWl0zz4a4HeReidDlE8QlxlKBSJKZCaqui5XgkO EsMghjG/OhpIJFbN6WeZ/CBH+bSbOlX4x5oWk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=74PdnrytGEwWCHrhIeGtMiiYzkZWbDnFWAdAeE3FcWw=; b=CRN8oZxTSVnv0d0vRt8Xo6dDKDygB1N4JnfQI/b8TlnO0xYQDyeE4GjxrDj+A35Izv /0xr5URUuPEOqc+CU9MijjU/p+3tFWBTqnYJkjVnPDWthhQj/A0ET22YTnEX1YfVpvYt W4FxmccOJnx3A5lTMkkX6diUds+wxpNhESE2WPCxwB0//Co8Dd9i/TfhH/pTrvEYQpH+ XsET8lUmPP1853a6CyzQLTvvLMCZZ2jj7OhcJQxxjO3ywv+p9wbjhiWeSYWkKn20BzkA mFtGiRBdw93c+yH9Ewg9yiPmjxn1Z8d09uqqYdP//y45HpMoX8WFJrL8kDZ0kQfDRRRb STEA== X-Gm-Message-State: ALQs6tDrtpdSABVr63oLiqk23/M5FGTewFSUCyBoDHznntgsS6HlQdXf QexiZTK9pVdWGuxhjXj0YMFX7w== X-Google-Smtp-Source: AIpwx487z+aLlnOmCjMjGrt7UznnSFXpD/lzDudSPWr77U6EsDW3Z/2gvcLPIlD7KPdnyPcWa4KtYg== X-Received: by 10.98.72.209 with SMTP id q78mr18534914pfi.70.1524576942286; Tue, 24 Apr 2018 06:35:42 -0700 (PDT) Received: from localhost.localdomain ([183.82.229.182]) by smtp.gmail.com with ESMTPSA id b81sm4836029pfj.176.2018.04.24.06.35.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Apr 2018 06:35:41 -0700 (PDT) From: Jagan Teki To: Maxime Ripard Subject: [RFC 12/13] arm64: dts: allwinner: a64: Add HDMI pipeline Date: Tue, 24 Apr 2018 19:04:24 +0530 Message-Id: <20180424133425.24291-13-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180424133425.24291-1-jagan@amarulasolutions.com> References: <20180424133425.24291-1-jagan@amarulasolutions.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180424_063553_760766_4EB388AA X-CRM114-Status: GOOD ( 15.29 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Jernej Skrabec , Catalin Marinas , linux-sunxi@googlegroups.com, Will Deacon , linux-kernel@vger.kernel.org, Chen-Yu Tsai , Rob Herring , Jagan Teki , Michael Trimarchi , linux-arm-kernel@lists.infradead.org, Icenowy Zheng MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 = ; + 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 {