From patchwork Tue Apr 24 13:34:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 10359937 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 4B20A60225 for ; Tue, 24 Apr 2018 13:42:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA9CA27F81 for ; Tue, 24 Apr 2018 13:42:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF55428DEF; Tue, 24 Apr 2018 13:42:04 +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 BA63D27F81 for ; Tue, 24 Apr 2018 13:42:03 +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=F47mEKZccbwxD88Gmnr/bminCDHiWTO/Cxnb6HRVyPg=; b=a4k4Z7sLQFEKLHcfo0GG3ShZJh jKVl7A+9kcPE80LsCsoyT3MM/A53R5RkoCg9sEHylsCmmFD+ahmnZtH6J4HOcm3alTGNOGd0SKFQq R92Vk85NWSvPoBZiKYHjV3CanlYrI4sp5PhPfH/jaBMhv0uhGRxOB2eorzFpL07u00+XbPno3Jvg9 B9G74x6okx0ZYv3VvH8HtV9RdxD7h3DJp9AAxm0MTnMC1GOgXHuvNxA/VNZQoCE1BaRs8ymtksa7V hZMPIuQ+MmC/veHaL7g6uXlzWYXQjGCK0XQuXdIrQqz7vHnLAaKCx0eUMT9LzowyL3yErzlv80LRF BVvvMKog==; 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 1fAyCj-000298-7h; Tue, 24 Apr 2018 13:41:57 +0000 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fAy6K-0005EO-Cg for linux-arm-kernel@lists.infradead.org; Tue, 24 Apr 2018 13:35:23 +0000 Received: by mail-pf0-x243.google.com with SMTP id a14so1775933pfi.1 for ; Tue, 24 Apr 2018 06:35:10 -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=Eo/OEs0/UzzX9x82vIrQeiTVJhJ7iDhNbY2RAy3xv1c=; b=bnIoDtK8NaLkT6SwFpyW8ZxUMiuhbu/EA9gpJ6V0a8GfTZlR+iW/rlHxdUjftTkKU0 zi1sSDIamBqTwbmQvG9swG+ZhR8O6jG5mHxV5vW6Q/NWxuuB7aV4mCEGZvT/CMOinIOs vZwZywfIeztImT4ywMUQkR47u+kBmoCMhPSyY= 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=Eo/OEs0/UzzX9x82vIrQeiTVJhJ7iDhNbY2RAy3xv1c=; b=jWQmIXXd3pbX6H7R3qdYmfzpL6au6zI2D3nr5Q30cyKREG0/rJG+x+RztricV6utv3 pj02HDfH/skopbLLDiTGr46wC1JHmcCHS9JttMXyUNyvlaHeOV38Y3pXqu9HAhkS3PUA 5RPpPmA4ZquFj7GoZWiOI9Az1e5z56/p/X5PBnOqpOrLJkBgJXv2FQbunzUlHiUAf1/d yGJPx7l6Hxuu9O0wu4vX9vrM6fWuGSVIPzLkUT7zWfAgDelgEvtlrHLCJYn6W7z4/3oz S7s1JAsfPvbWdXgWKwvXoUOnH0k1SWSSAfWUQfQjEXPn+ax9qFbvzXpTOEZ/q8a/zcWa VXlA== X-Gm-Message-State: ALQs6tDLr7uzHznnbnUK/coq+v1GvtEL/RMHiAomxb2FpHBz6WnI2S0j UOLy0vs3wuGqyKoXSNGOOeyXeg== X-Google-Smtp-Source: AIpwx49WlpW4pmAVKzJQ0u4QBcF6suZ4R1l4kDSCd3Ob+J/k7w6y52Y3mobwYZ5BnUfmJc3KvnDNZQ== X-Received: by 2002:a17:902:a5:: with SMTP id a34-v6mr21792458pla.58.1524576909026; Tue, 24 Apr 2018 06:35:09 -0700 (PDT) Received: from localhost.localdomain ([183.82.229.182]) by smtp.gmail.com with ESMTPSA id b81sm4836029pfj.176.2018.04.24.06.35.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Apr 2018 06:35:08 -0700 (PDT) From: Jagan Teki To: Maxime Ripard Subject: [RFC 06/13] arm64: dts: allwinner: a64: Add DE2 pipeline Date: Tue, 24 Apr 2018 19:04:18 +0530 Message-Id: <20180424133425.24291-7-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_063520_516117_ECC02ABD X-CRM114-Status: GOOD ( 17.40 ) 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 The display pipeline on A64 has similar behavior like A83T, so use A83 compatible strings for probing relevant drivers. Added Mixer0, tcon0 has initial support, rest will add eventually. Signed-off-by: Jagan Teki --- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 61 +++++++++++++++++++++++++++ drivers/gpu/drm/sun4i/sun4i_drv.c | 1 + 2 files changed, 62 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index 67b80bbe5bf5..b8734319dc77 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 = <&mixer0>; + status = "disabled"; + }; + osc24M: osc24M_clk { #clock-cells = <0>; compatible = "fixed-clock"; @@ -183,6 +189,30 @@ #reset-cells = <1>; }; + mixer0: mixer@1100000 { + compatible = "allwinner,sun50i-a64-de2-mixer-0", + "allwinner,sun8i-a83t-de2-mixer-0"; + reg = <0x01100000 0x100000>; + clocks = <&display_clocks CLK_BUS_MIXER0>, + <&display_clocks CLK_MIXER0>; + clock-names = "bus", + "mod"; + resets = <&display_clocks RST_MIXER0>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + mixer0_out: port@1 { + reg = <1>; + + mixer0_out_tcon0: endpoint { + remote-endpoint = <&tcon0_in_mixer0>; + }; + }; + }; + }; + syscon: syscon@1c00000 { compatible = "allwinner,sun50i-a64-system-controller", "syscon"; @@ -200,6 +230,37 @@ #dma-cells = <1>; }; + tcon0: lcd-controller@1c0c000 { + compatible = "allwinner,sun50i-a64-tcon-lcd", + "allwinner,sun8i-a83t-tcon-lcd"; + reg = <0x01c0c000 0x1000>; + interrupts = ; + clocks = <&ccu CLK_BUS_TCON0>, <&ccu CLK_TCON0>; + clock-names = "ahb", "tcon-ch0"; + clock-output-names = "tcon-pixel-clock"; + resets = <&ccu RST_BUS_TCON0>; + reset-names = "lcd"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + tcon0_in: port@0 { + reg = <0>; + + tcon0_in_mixer0: endpoint { + remote-endpoint = <&mixer0_out_tcon0>; + }; + }; + + tcon0_out: port@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + }; + }; + }; + mmc0: mmc@1c0f000 { compatible = "allwinner,sun50i-a64-mmc"; reg = <0x01c0f000 0x1000>; diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c index 50d19605c38f..c84102a750f8 100644 --- a/drivers/gpu/drm/sun4i/sun4i_drv.c +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c @@ -368,6 +368,7 @@ static const struct of_device_id sun4i_drv_of_table[] = { { .compatible = "allwinner,sun8i-h3-display-engine" }, { .compatible = "allwinner,sun8i-v3s-display-engine" }, { .compatible = "allwinner,sun9i-a80-display-engine" }, + { .compatible = "allwinner,sun50i-a64-display-engine" }, { } }; MODULE_DEVICE_TABLE(of, sun4i_drv_of_table);