From patchwork Thu Dec 7 09:53:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 10098201 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 3E1D660329 for ; Thu, 7 Dec 2017 10:17:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A8BC2A3FB for ; Thu, 7 Dec 2017 10:17:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1E4462A405; Thu, 7 Dec 2017 10:17:39 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED 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 AA5EA2A3FB for ; Thu, 7 Dec 2017 10:17:38 +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=fSV0qSmTnS4FVr1UFvAJiTBjuhmWWpC4NHvW8yj+A1I=; b=JeXg9kMsS+HoQ0U3Uwg/M3wnpY DJWifsQpxWYu6TCK5zL3Q0qEE/2mdb07hEn+BPYEJQbf47zmihQsbUn99kYhqe4SlHH/AJ2Dznpp1 iVwwM7omINlVfARWArlxC++S+mE79LBB2zjxZ7vq6I7btr9Rt0N8WHGkC5W5FQX2C22R6TtFfQo6M 9V1+lenSm4US/uGMKHmVivHXAio47uxOAKnfkhL0Jkefyq9vPQ/CQT98AthwraIew3FxGUM6+smiD dJMkh2dkRizjtlk/rOSIcg8jAJsYlpsFMCeJJPg3TE1fL31dgOouXOiT+F1Nq7rv+8aTQnnwE+rV+ nvSF88Lw==; 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 1eMtFJ-0004N2-DX; Thu, 07 Dec 2017 10:17:37 +0000 Received: from kirsty.vergenet.net ([202.4.237.240]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eMtDK-00052c-90 for linux-arm-kernel@lists.infradead.org; Thu, 07 Dec 2017 10:16:40 +0000 Received: from penelope.horms.nl (unknown [217.111.208.18]) by kirsty.vergenet.net (Postfix) with ESMTPA id F13A725BEFE; Thu, 7 Dec 2017 20:55:12 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1512640513; bh=0rwa+vPpegtdYvUdHCAAKT3lLLhqdYHRGlzlN9G2l5E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JLOJfza5W1hD5x9ojMnjUB8POSDtdCSI3N6MVnyj+nE58w0ajT2wscK8fzteqk8RR Ohf19ef8hU5ojvBBjh8uFP8CwUo15vOfh0KJxIxKWtTolFwaqw1wQ6iyPdZiLebIWr dYDKdbWSE/lIqLE2ZZwE+znD7jHnAWdbYMOKih2A= Received: by penelope.horms.nl (Postfix, from userid 7100) id 61450E22363; Thu, 7 Dec 2017 10:54:03 +0100 (CET) From: Simon Horman To: linux-renesas-soc@vger.kernel.org Subject: [PATCH 46/54] arm64: dts: renesas: r8a77970: Tie SYS-DMAC to IPMMU-DS1 Date: Thu, 7 Dec 2017 10:53:49 +0100 Message-Id: <0071fcd1a9598996bd0fe3d5f746de0d55d97b11.1512640145.git.horms+renesas@verge.net.au> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171207_021535_039681_75BF0B75 X-CRM114-Status: UNSURE ( 6.39 ) X-CRM114-Notice: Please train this message. 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: Simon Horman , Magnus Damm , 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 Hook up r8a77970 DMAC nodes to the IPMMU. In particular SYS-DMAC1 and SYS-DMAC2 get tied to IPMMU-DS1. Based on work for the r8a7796 by Magnus Damm. Signed-off-by: Simon Horman Reviewed-by: Geert Uytterhoeven --- arch/arm64/boot/dts/renesas/r8a77970.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm64/boot/dts/renesas/r8a77970.dtsi b/arch/arm64/boot/dts/renesas/r8a77970.dtsi index 5f73ee2dfd6d..108c6159c847 100644 --- a/arch/arm64/boot/dts/renesas/r8a77970.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a77970.dtsi @@ -224,6 +224,10 @@ resets = <&cpg 218>; #dma-cells = <1>; dma-channels = <8>; + iommus = <&ipmmu_ds1 0>, <&ipmmu_ds1 1>, + <&ipmmu_ds1 2>, <&ipmmu_ds1 3>, + <&ipmmu_ds1 4>, <&ipmmu_ds1 5>, + <&ipmmu_ds1 6>, <&ipmmu_ds1 7>; }; dmac2: dma-controller@e7310000 { @@ -248,6 +252,10 @@ resets = <&cpg 217>; #dma-cells = <1>; dma-channels = <8>; + iommus = <&ipmmu_ds1 16>, <&ipmmu_ds1 17>, + <&ipmmu_ds1 18>, <&ipmmu_ds1 19>, + <&ipmmu_ds1 20>, <&ipmmu_ds1 21>, + <&ipmmu_ds1 22>, <&ipmmu_ds1 23>; }; hscif0: serial@e6540000 {