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: 10373207 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 2A1976032A for ; Tue, 1 May 2018 06:52:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1986E2881B for ; Tue, 1 May 2018 06:52:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0E14228BFA; Tue, 1 May 2018 06:52:37 +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=-5.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9A6942881B for ; Tue, 1 May 2018 06:52:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4B0D06E3CC; Tue, 1 May 2018 06:51:49 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pg0-x242.google.com (mail-pg0-x242.google.com [IPv6:2607:f8b0:400e:c05::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4BA316E1FB for ; Mon, 30 Apr 2018 11:42:46 +0000 (UTC) Received: by mail-pg0-x242.google.com with SMTP id a13-v6so6154616pgu.4 for ; Mon, 30 Apr 2018 04:42:46 -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=Pzm3AjEH89lOvsHXKS3LoDrShU+dp1FHWYm9S9DeiBAXxayipgvjD86dkn0rdA2SMf /tcC/bkS9jDm6XcTHagkvwe0kE0PNZCvGy2RP6Kk0vnF0avDHoIRUzNrd49Hg8ApT2dp 4GemyBLogCfW52O7kwg7BuSw9by+HckGBBxQSQSSl4yVeRj6Dy8JwXzSmc5NCj4IAhYZ YQSpxO11Y5bGK8ZrfRpTITWrPk2fCvViElpIExZ/HMKwYbT2rtqmON/Az52Z/VPIydnA VUysDQdmKJwJlCZjzyxZe/tH1mCG0FTHH3Mqjq5k7q5e9K1jmwZWsLYvex6L9ljKu46v suYg== X-Gm-Message-State: ALQs6tAkUOOPuu3V3YF/RqzTx99namUh5X3QH6Vzaq+ipcUffh802xiY ukhJwIL8aQcO72gba1aqc7hRDQ== 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-Mailman-Approved-At: Tue, 01 May 2018 06:51:33 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development 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 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 {