From patchwork Thu Aug 2 20:00:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 10554123 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 262CA174A for ; Thu, 2 Aug 2018 20:00:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E8B92C332 for ; Thu, 2 Aug 2018 20:00:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1B7F62C36B; Thu, 2 Aug 2018 20:00:42 +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,UNPARSEABLE_RELAY autolearn=ham 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 C8FBC2C356 for ; Thu, 2 Aug 2018 20:00:41 +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=EdVFpBcravYBOuPPGx+wC0GZEmj8Y4wPSSChR/jv4wY=; b=KPLyPoSxnpZockGEp9OFgzPLvZ RrxIyOvGS5xwjC7ynrLeq8vOGz9OAj7GNbyeSeRMgkGtaPjbmC3IkZ9uZLkxHDUMLWSGX0BCbaVRk HYs5kGBoF1XYLsNhObojtFaqOVugLvui/RIkxOSkcVkVZA2ApmG9F11sBCjwtYWP92ZDv0zIs+uXX MpRr2B2DlyqKCgPdk3LTvjF9jYVNXCa9Hsb4QyIObt+Ir+NxiN8PPQlv7CwQFGI+35yMn1jBBwKu+ kV0eLAdAb7QI5Gonl2H5JME3chEDGogDhMAwUGBSNxnSBVHaBE9QQHw8vs67XEKvUAMNbxIDfcV+O efT0779A==; 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 1flJm3-0005Ws-MV; Thu, 02 Aug 2018 20:00:39 +0000 Received: from bhuna.collabora.co.uk ([2a00:1098:0:82:1000:25:2eeb:e3e3]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1flJlz-0005UH-O9 for linux-rockchip@lists.infradead.org; Thu, 02 Aug 2018 20:00:37 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: ezequiel) with ESMTPSA id F0E8527DFC7 From: Ezequiel Garcia To: linux-media@vger.kernel.org Subject: [PATCH v2 2/6] ARM: dts: rockchip: add VPU device node for RK3288 Date: Thu, 2 Aug 2018 17:00:06 -0300 Message-Id: <20180802200010.24365-3-ezequiel@collabora.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180802200010.24365-1-ezequiel@collabora.com> References: <20180802200010.24365-1-ezequiel@collabora.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180802_130035_949139_FD0F30D3 X-CRM114-Status: UNSURE ( 9.81 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Nicolas Dufresne , Tomasz Figa , linux-rockchip@lists.infradead.org, Rob Herring , Hans Verkuil , kernel@collabora.com, Ezequiel Garcia MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add the Video Processing Unit node for RK3288 SoC. Also, enable the VPU IOMMU node, as it's needed for any user that wants to use the VPU with the IOMMU. Signed-off-by: Ezequiel Garcia --- arch/arm/boot/dts/rk3288.dtsi | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 0840ffb3205c..a86f0c7d8e71 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -1223,6 +1223,18 @@ }; }; + vpu: video-codec@ff9a0000 { + compatible = "rockchip,rk3288-vpu"; + reg = <0x0 0xff9a0000 0x0 0x800>; + interrupts = , + ; + interrupt-names = "vepu", "vdpu"; + clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>; + clock-names = "aclk", "hclk"; + power-domains = <&power RK3288_PD_VIDEO>; + iommus = <&vpu_mmu>; + }; + vpu_mmu: iommu@ff9a0800 { compatible = "rockchip,iommu"; reg = <0x0 0xff9a0800 0x0 0x100>; @@ -1231,7 +1243,6 @@ clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>; clock-names = "aclk", "iface"; #iommu-cells = <0>; - status = "disabled"; }; hevc_mmu: iommu@ff9c0440 {