From patchwork Thu Mar 16 20:47:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Icenowy Zheng X-Patchwork-Id: 9629317 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 576B560249 for ; Thu, 16 Mar 2017 20:50:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 46FDD2868D for ; Thu, 16 Mar 2017 20:50:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 38BA228691; Thu, 16 Mar 2017 20:50:18 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 87C9F2868D for ; Thu, 16 Mar 2017 20:50:17 +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=Yh+pn35gBlGsAUhXh4Z1N84sXWvv8kd86eHtUg9CJNk=; b=oHYrruMhB/KUFVy5Y84t4QlStj ZjvLyj9Cf7F9pmqGhWVoUPlu3d0FHPBvcFkL/txW0OCFYqSlRdd6NNKJGdekvTsGeAHPYxiK78aAw aTcyV0N47QqfC+DcSckWz2ZxwkGEzBC/IF7ECibkXBUH8fS5ItcNzktePyWsaRBrEcBkcamejL9HG pfQEs552D8IayNsYYqMe9U1Y2Sw14dWMr1WVYzlHF7TMT85QYUgiVXIfbh4PLEp6XbhX3nGC4yP2N c/kJrSCKVO/5xVdBxceXPU3nnEtvVdVaDUPmPTkEsUCL/cPIapXtfW/FvHrLBxJYUz0xncYIZFiki S6va8V6Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cocLa-00081y-UB; Thu, 16 Mar 2017 20:50:10 +0000 Received: from forward7o.cmail.yandex.net ([37.9.109.53]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cocLK-0006h0-Fl for linux-arm-kernel@lists.infradead.org; Thu, 16 Mar 2017 20:50:07 +0000 Received: from smtp3j.mail.yandex.net (smtp3j.mail.yandex.net [95.108.130.68]) by forward7o.cmail.yandex.net (Yandex) with ESMTP id CFB5821833; Thu, 16 Mar 2017 23:49:29 +0300 (MSK) Received: from smtp3j.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtp3j.mail.yandex.net (Yandex) with ESMTP id 8E25D624106E; Thu, 16 Mar 2017 23:49:23 +0300 (MSK) Received: by smtp3j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id cN2NeqrDXI-nHNmIOdx; Thu, 16 Mar 2017 23:49:22 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client certificate not present) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aosc.xyz; s=mail; t=1489697362; bh=24sZ6Jb/SOQwj9qjV+KHAqtW6gbBGhogl4AJaE9To9E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=PmcNUriCjJ9cj7Blwt7BBtCJYY/VSa2+bKAsvjgSA07EMJOk4ej7KSAUtOALXrqbM IUMnkKWF2euuPImxkFJ2UPjWaWEc8hIl729hGu1F2sN+npCGwz73+hAlMciHTQP1pu AeD3cfE0/lWxJtWX0BpcD3H7lomAergbhvcHMQpY= Authentication-Results: smtp3j.mail.yandex.net; dkim=pass header.i=@aosc.xyz X-Yandex-ForeignMX: US X-Yandex-Suid-Status: 1 0, 1 0, 1 0, 1 0, 1 0, 1 0, 1 0, 1 0, 1 0, 1 1130000036118848 From: Icenowy Zheng To: Rob Herring , Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec Subject: [PATCH v2 3/8] dt-bindings: add bindings for DE2 on V3s SoC Date: Fri, 17 Mar 2017 04:47:43 +0800 Message-Id: <20170316204748.8596-4-icenowy@aosc.xyz> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170316204748.8596-1-icenowy@aosc.xyz> References: <20170316204748.8596-1-icenowy@aosc.xyz> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170316_134955_348228_897942AB X-CRM114-Status: GOOD ( 10.32 ) 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: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Icenowy Zheng , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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 Allwinner V3s SoC have a display engine which have a different pipeline with older SoCs. Add document for it (new compatibles and the new "mixer" part). The paragraph of TCON is also refactored, for furtherly add TCONs in A83T/H3/A64/H5 that have only a channel 1 (used for HDMI or TV Encoder). Signed-off-by: Icenowy Zheng --- .../bindings/display/sunxi/sun4i-drm.txt | 37 +++++++++++++++++++--- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt index b82c00449468..2c293247c41d 100644 --- a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt +++ b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt @@ -31,11 +31,11 @@ Required properties: * allwinner,sun6i-a31-tcon * allwinner,sun6i-a31s-tcon * allwinner,sun8i-a33-tcon + * allwinner,sun8i-v3s-tcon - reg: base address and size of memory-mapped region - interrupts: interrupt associated to this IP - - clocks: phandles to the clocks feeding the TCON. Three are needed: + - clocks: phandles to the clocks feeding the TCON - 'ahb': the interface clocks - - 'tcon-ch0': The clock driving the TCON channel 0 - resets: phandles to the reset controllers driving the encoder - "lcd": the reset line for the TCON channel 0 @@ -52,7 +52,12 @@ Required properties: second the block connected to the TCON channel 1 (usually the TV encoder) -On SoCs other than the A33, there is one more clock required: +On TCONs that have a channel 0 (currently all TCONs supported), there +is one more clock required: + - 'tcon-ch0': The clock driving the TCON channel 0 + +On TCONs that have a channel 1 (currently all TCONs except the ones in +A33 and V3s), there is one more clock required: - 'tcon-ch1': The clock driving the TCON channel 1 DRC @@ -137,6 +142,26 @@ Required properties: Documentation/devicetree/bindings/media/video-interfaces.txt. The first port should be the input endpoints, the second one the outputs +Display Engine 2.0 Mixer +------------------------ + +The DE2 mixer have many functionalities, currently only layer blending is +supported. + +Required properties: + - compatible: value must be one of: + * allwinner,sun8i-v3s-de2-mixer + - reg: base address and size of the memory-mapped region. + - clocks: phandles to the clocks feeding the frontend and backend + * bus: the backend interface clock + * ram: the backend DRAM clock + - clock-names: the clock names mentioned above + - resets: phandles to the reset controllers driving the backend + +- ports: A ports node with endpoint definitions as defined in + Documentation/devicetree/bindings/media/video-interfaces.txt. The + first port should be the input endpoints, the second one the output + Display Engine Pipeline ----------------------- @@ -151,9 +176,13 @@ Required properties: * allwinner,sun6i-a31-display-engine * allwinner,sun6i-a31s-display-engine * allwinner,sun8i-a33-display-engine + * allwinner,sun8i-v3s-display-engine - allwinner,pipelines: list of phandle to the display engine - frontends available. + pipeline entry point. For SoCs with original DE (currently + all SoCs supported by display engine except V3s), this + phandle should be a display frontend or backend; for SoCs + with DE2, this phandle should be a mixer. Example: