From patchwork Fri Mar 9 10:14:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Kocialkowski X-Patchwork-Id: 10270363 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 D943560594 for ; Fri, 9 Mar 2018 10:18:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1B5C299E5 for ; Fri, 9 Mar 2018 10:18:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B62C129CE8; Fri, 9 Mar 2018 10:18:11 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 43560299E5 for ; Fri, 9 Mar 2018 10:18:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751102AbeCIKRm (ORCPT ); Fri, 9 Mar 2018 05:17:42 -0500 Received: from mail.bootlin.com ([62.4.15.54]:49983 "EHLO mail.bootlin.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751151AbeCIKPy (ORCPT ); Fri, 9 Mar 2018 05:15:54 -0500 Received: by mail.bootlin.com (Postfix, from userid 110) id C64D7207DA; Fri, 9 Mar 2018 11:15:51 +0100 (CET) Received: from localhost.localdomain (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.bootlin.com (Postfix) with ESMTPSA id 4A66720712; Fri, 9 Mar 2018 11:15:51 +0100 (CET) From: Paul Kocialkowski To: linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com Cc: Icenowy Zheng , Florent Revest , Alexandre Courbot , Hans Verkuil , Laurent Pinchart , Sakari Ailus , Maxime Ripard , Thomas van Kleef , "Signed-off-by : Bob Ham" , Thomas Petazzoni , Chen-Yu Tsai Subject: [PATCH 7/9] ARM: dts: sun5i: Use video-engine node Date: Fri, 9 Mar 2018 11:14:43 +0100 Message-Id: <20180309101445.16190-5-paul.kocialkowski@bootlin.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180309100933.15922-3-paul.kocialkowski@bootlin.com> References: <20180309100933.15922-3-paul.kocialkowski@bootlin.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Florent Revest Now that we have a driver matching "allwinner,sun4i-a10-video-engine" we can load it. The "video-engine" node depends on the new sunxi-ng's CCU clock and reset bindings. This patch also includes a ve_reserved DMA pool for videobuf2 buffer allocations in sunxi-cedrus. Signed-off-by: Florent Revest [Icenowy: beautify the node name] Signed-off-by: Icenowy Zheng --- arch/arm/boot/dts/sun5i-a13.dtsi | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi index 4e830f5cb7f1..18bc8d739cd0 100644 --- a/arch/arm/boot/dts/sun5i-a13.dtsi +++ b/arch/arm/boot/dts/sun5i-a13.dtsi @@ -51,6 +51,19 @@ / { interrupt-parent = <&intc>; + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + ve_reserved: cma { + compatible = "shared-dma-pool"; + reg = <0x43d00000 0x9000000>; + no-map; + linux,cma-default; + }; + }; + thermal-zones { cpu_thermal { /* milliseconds */ @@ -97,6 +110,23 @@ status = "disabled"; }; + ve: video-engine@01c0e000 { + compatible = "allwinner,sun4i-a10-video-engine"; + memory-region = <&ve_reserved>; + + clocks = <&ccu CLK_AHB_VE>, <&ccu CLK_VE>, + <&ccu CLK_DRAM_VE>; + clock-names = "ahb", "mod", "ram"; + + assigned-clocks = <&ccu CLK_VE>; + assigned-clock-rates = <320000000>; + + resets = <&ccu RST_VE>; + + interrupts = <53>; + + reg = <0x01c0e000 0x1000>; + }; }; };