From patchwork Mon Apr 30 11:40:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 10371665 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 E33FE6053E for ; Mon, 30 Apr 2018 12:00:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D065928AA2 for ; Mon, 30 Apr 2018 12:00:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C42E928AA5; Mon, 30 Apr 2018 12:00:52 +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 40A0428AA2 for ; Mon, 30 Apr 2018 12:00:52 +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=4g39mmGawJyXSdKu28ZzT9KjOg1E+UZWos+1J85O6fM=; b=t1fDJ/FldoJk5RUnUa9E8ikAY3 tJ4WkWu/eGrtMrjDnECfon3SUDAREugmYpfDQ0+/jBU7iEMFrP431WtkKxt3Swky2B7zUoVUw1cwc yCSEDJgNVp05CSWrxsuLDJm/lG2sYQwwSnCtP5uoSDLl73DYkM0joBXkodkRPs2FnxQPXuSZSrK1R toU4s+JgQuBrHFe2Bky3fLyBaaLtEdh5Wp7Trd2oKk1qs90EJazQJ2Bo5KiyvZGIlmVZe7gtJlHDP yt9A6rw9dbYgMm7rchAkrkcB639PrRt38aGOSgTtiy6nQ6fqunU2IDLA7FzcWGFwH5NufC+OLaSLD vW/ZmkVA==; 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 1fD7U4-0002D2-6E; Mon, 30 Apr 2018 12:00:44 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fD7Rh-0008Ah-Se for linux-arm-kernel@bombadil.infradead.org; Mon, 30 Apr 2018 11:58:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=63QDmKraoUWqE7ykgA/cU3yS9Z1bYBM0FR1FOTe5WuQ=; b=aHd37jw4o+idWXw26OIprSDoM rHOuC6ynKQMnKu+4GKxNtj41vJkOgpLa28Spo9X3c0kQZB8e2+lZTvC4TlL1KHOhZ4rTrNo37P+Qv sJMerUMGYDukw6VdZs6R2MuHhMYQ9mZ4zXtIbfPRYeNrQWDJ2fXObP5Xvd0K2YouGO2CTtJnHS73V 508ZZafTAB9/QXz10+JitTOnrrWNfFdFBuUrWBJgwe1DkTAcWbthiXP5TMd9kGMH9wf99mgEclFMH kgU3lYUePgexFMNLS+xN2MW552UHoC3O79Y6vI3KZ+WsnwwfcVwUVmVNy/R8+dUvfBfbe5k0Udrgp z0TwLB2lg==; Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fD7Cr-0001iN-Bi for linux-arm-kernel@lists.infradead.org; Mon, 30 Apr 2018 11:42:59 +0000 Received: by mail-pg0-x243.google.com with SMTP id z4-v6so6136925pgu.13 for ; Mon, 30 Apr 2018 04:42:47 -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=63QDmKraoUWqE7ykgA/cU3yS9Z1bYBM0FR1FOTe5WuQ=; b=mZDcGrSj1xoDSbqB3y64FsiCOimy7Ma0oT80XDpIaj2io+ARxk88YWkOptExys/9Ni wV/+dWUviMtP/Y+qFCYJgbQeJ/2VmCmgKH0Svak0UmVNXOvS6VES/hp4CZYAuPK64hC8 7L3Z8q812li3jKdxsZPQ4hUGMnhyAYi7JtpTQ= 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=63QDmKraoUWqE7ykgA/cU3yS9Z1bYBM0FR1FOTe5WuQ=; b=AJ171uD/mslZiDzZab9gUY6+p7glTyx6hTmixKxbS6lSi9cU9DDCUCcgSWdBfrLnSH a4fUGYnSofcQjaJ+KgOEO9rak7xqhuvsIMPNiCveYn/WnkUxUmh1ZTVzY4s4hkSDAXyf hrz+Mcr0zzxxS5HsW6hlbDyporw5w4qyiNFFS3Kurpx0TYRd+N+s6+H1mRouEF50Rqp0 7nPjNKK4lqxE6P14oYzZ9jHPeCpVQ39f592R6ooH1aBiNDmDOPB6onZ2LK8bs3Snko67 FFa+RDFqr6DIGbfs936nn/C0wy0tz7ojyeCgQN7EHW/tSZ4hGq+DTVHfoNaYpQIF+3P7 I1mQ== X-Gm-Message-State: ALQs6tBXgNGDbPkY3CO0lIMhoyqbgFAXiKVdOf1dwERbwngq0aew7/Wt uE4B28L/JW4mHpIpQG462E9XMg== X-Google-Smtp-Source: AB8JxZoSJnnZgtBg3xJgCpsYZNogIoQQD/NTqauN0rEL3QGRs0RayV/n4VXqVmw/UfD9i/syT44+NA== X-Received: by 2002:a17:902:5402:: with SMTP id d2-v6mr12215133pli.386.1525088565697; Mon, 30 Apr 2018 04:42:45 -0700 (PDT) Received: from localhost.localdomain ([183.82.224.14]) by smtp.gmail.com with ESMTPSA id s17sm16762357pfi.165.2018.04.30.04.42.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Apr 2018 04:42:45 -0700 (PDT) From: Jagan Teki To: Maxime Ripard Subject: [PATCH 14/21] arm64: dts: allwinner: a64: Add HDMI pipeline Date: Mon, 30 Apr 2018 17:10:51 +0530 Message-Id: <20180430114058.5061-15-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180430114058.5061-1-jagan@amarulasolutions.com> References: <20180430114058.5061-1-jagan@amarulasolutions.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180430_124257_444966_1C6DC926 X-CRM114-Status: GOOD ( 18.21 ) 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 , David Airlie , Catalin Marinas , Michael Turquette , linux-sunxi@googlegroups.com, Will Deacon , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Stephen Boyd , Chen-Yu Tsai , Rob Herring , Jagan Teki , Michael Trimarchi , linux-clk@vger.kernel.org, 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 | 83 +++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index da9128ae836d..f017baa4f5db 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -107,6 +107,12 @@ }; }; + de: display-engine { + compatible = "allwinner,sun50i-a64-display-engine"; + allwinner,pipelines = <&mixer1>; + status = "disabled"; + }; + osc24M: osc24M_clk { #clock-cells = <0>; compatible = "fixed-clock"; @@ -183,6 +189,31 @@ #reset-cells = <1>; }; + 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"; @@ -200,6 +231,41 @@ #dma-cells = <1>; }; + 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>; @@ -658,6 +724,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 {