From patchwork Fri Nov 30 17:34:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 10706985 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 0A26213BF for ; Fri, 30 Nov 2018 18:11:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED66A30242 for ; Fri, 30 Nov 2018 18:11:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E049830248; Fri, 30 Nov 2018 18:11:29 +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.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,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 74E6230242 for ; Fri, 30 Nov 2018 18:11:29 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=qA8zY5uTipMWls8MnTv/62PqF9WXC74ITFJDjQsvrK0=; b=XID9+6L9wXJgAJ BUhktS1cjV9V1/GnUaQROeR+kruYuCK/mIRr/PGQtedgODcRnWYvQcLVdrhXRAaguMsPE3dsuYKpD pheHHU/HCnC88aQbqfa5D5TwsyUXgXo39cUU9rt0VOEmUtTYOWBWHq3hoU6VL4NDKLLd7tF6fEYRb DVVDfHmJpf4gjHcxSGzudW1lqz579WXzBFmkMIGGtxrmxzzMMPY1roymC+4terrW7vI4ctuu4bLgs OVjYKVXPnPTklsL7ZAkBoXZrLJ/IjAfuO9w9rqVKf7hUwSPb0EK7Pzo9nEBlU3vjOsuy9rrHQAygW 9vA7keS2jaoK30Zo5YeQ==; 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 1gSnGA-0004iA-5W; Fri, 30 Nov 2018 18:11:26 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gSnG8-0004hv-5n for linux-rockchip@bombadil.infradead.org; Fri, 30 Nov 2018 18:11:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=4hNZTCI6bnqw83cL2ukKYEp3LZ8uh63jmlWOjrj1ySg=; b=ArTRwlAJYiJbwRym1vWY625W2/ iGfoYN60gOBYHqiH00i2yk7zLLSZYyxvd2WeRQDgqSTsHSqaFJJeL8wVKTD2yaJaOPo0su8R8qW/m 0xqlJbE6fPMngfyHjQs/CVSqo0xIaEiRn370p17Q+l3PJqAAzwH+Cu+rp5JZL7fS7WeoGilETrTXJ CAOjLyaA5iZXvIIARx6b7soVjKHEBhdtr1xcMBumF6J0zqurvUDfYnt/XXeKOjP0oYcreFiZr6vbD C5cdvQYryhNy0ctoOPY3iPqlXjxWZrzucMftK7CfzMYpbCfOpgpolRnDsKHXTomrSs/4zIaDGhtFv 903rss1Q==; Received: from bhuna.collabora.co.uk ([46.235.227.227]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gSmh2-0005bm-U5 for linux-rockchip@lists.infradead.org; Fri, 30 Nov 2018 17:35:09 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: ezequiel) with ESMTPSA id E284027E897 From: Ezequiel Garcia To: linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-rockchip@lists.infradead.org Subject: [PATCH v11 2/4] ARM: dts: rockchip: add VPU device node for RK3288 Date: Fri, 30 Nov 2018 14:34:31 -0300 Message-Id: <20181130173433.24185-3-ezequiel@collabora.com> X-Mailer: git-send-email 2.20.0.rc1 In-Reply-To: <20181130173433.24185-1-ezequiel@collabora.com> References: <20181130173433.24185-1-ezequiel@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181130_123509_110904_D4BD2AB3 X-CRM114-Status: UNSURE ( 9.62 ) 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 , Nicolas Dufresne , Heiko Stuebner , Tomasz Figa , Rob Herring , Hans Verkuil , Miouyouyou , kernel@collabora.com, Ezequiel Garcia 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. Fix the VPU IOMMU node, which was disabled and lacking its power domain property. Reviewed-by: Tomasz Figa Signed-off-by: Ezequiel Garcia --- arch/arm/boot/dts/rk3288.dtsi | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 0840ffb3205c..40d203cdca09 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>; @@ -1230,8 +1242,8 @@ interrupt-names = "vpu_mmu"; clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>; clock-names = "aclk", "iface"; + power-domains = <&power RK3288_PD_VIDEO>; #iommu-cells = <0>; - status = "disabled"; }; hevc_mmu: iommu@ff9c0440 {