From patchwork Thu Dec 7 09:53:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 10098145 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 DB74C60325 for ; Thu, 7 Dec 2017 10:07:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C8C4F2A291 for ; Thu, 7 Dec 2017 10:07:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BDACF2A3B6; Thu, 7 Dec 2017 10:07:37 +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 524F02A291 for ; Thu, 7 Dec 2017 10:07:37 +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=pq1muNBxWK+4Rty+4UjiLiKkcPaqVgf27GxwYashU0c=; b=Iju7C14tyOdVnr3lTSsFHQXl2f 7eMYYQURPBW3fMHJ0nHE2W43YUfMMr/ieeLE3YPHyvsKnavmygcKdknQtHVOLNqp11xob8QasOaF6 rmi3Uo5yhWSbKYMsLPT6A2AuiJbV7+EK7Ov9uCHFQFsbA3yZIESVYvhWePuAwyr4Z4b2eXIbS6L/Y l/SU2udaiLDImPcL9Joys9Viz6IxayvcI1ZyLnRDpx5/5Dnrqb0GilJ2D4upFA6D77XzsfPyZxPcZ jLeFDeQjSBVviJkcbQONhtoHYNfVKNBDGVrLUgXJkzGcjiBneOXlBpgAq4r/6eBZizxUAePQHuLh6 ODdP4zog==; 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 1eMt5U-0000hi-SI; Thu, 07 Dec 2017 10:07:28 +0000 Received: from kirsty.vergenet.net ([202.4.237.240]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eMt4J-00077L-W7 for linux-arm-kernel@lists.infradead.org; Thu, 07 Dec 2017 10:06:22 +0000 Received: from penelope.horms.nl (unknown [217.111.208.18]) by kirsty.vergenet.net (Postfix) with ESMTPA id 8C1E125BED3; Thu, 7 Dec 2017 20:54:56 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1512640496; bh=97+1wqqidARAoWEFLBSEjkybO7uTrcl41zK8Uc5OVAw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EBfsWdWf4Al8hIl2GcfYM9LyxIlH5fsbc9u/zdiu0OeZWpVjIH1/Y6N+N7gn74scv Gnrgjixo3e7ehFrbN/yxFRQmmginrZf74F8j3mKkg1rR/GpXGh+fbCKlT3vlgkPwJQ yfUL5laLAy6S5dcuN6Snbn3qCwwNBEYxTXRz5Cl4= Received: by penelope.horms.nl (Postfix, from userid 7100) id 09B56E21F88; Thu, 7 Dec 2017 10:54:03 +0100 (CET) From: Simon Horman To: linux-renesas-soc@vger.kernel.org Subject: [PATCH 25/54] arm64: dts: renesas: r8a7795: Point FDP1 via FCPF to IPMMU-VP0/1 Date: Thu, 7 Dec 2017 10:53:28 +0100 Message-Id: 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_020617_211151_0DF42592 X-CRM114-Status: UNSURE ( 7.50 ) 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: Magnus Damm , Magnus Damm , linux-arm-kernel@lists.infradead.org, Simon Horman 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 From: Magnus Damm Hook up the FCPF devices to allow use of FDP1 with IPMMU-VP. Signed-off-by: Magnus Damm Signed-off-by: Simon Horman Reviewed-by: Geert Uytterhoeven --- arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 4 ++++ arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2 ++ 2 files changed, 6 insertions(+) diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi index 1eafa5382e86..6b4dfa42f5b2 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi @@ -150,6 +150,10 @@ <&ipmmu_mp1 30>, <&ipmmu_mp1 31>; }; +&fcpf1 { + iommus = <&ipmmu_vp0 1>; +}; + &fcpvd2 { iommus = <&ipmmu_vi0 10>; }; diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi index 6187e9c33e88..f7d7c98a7f73 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi @@ -2070,6 +2070,7 @@ clocks = <&cpg CPG_MOD 615>; power-domains = <&sysc R8A7795_PD_A3VP>; resets = <&cpg 615>; + iommus = <&ipmmu_vp0 0>; }; fcpf1: fcp@fe951000 { @@ -2078,6 +2079,7 @@ clocks = <&cpg CPG_MOD 614>; power-domains = <&sysc R8A7795_PD_A3VP>; resets = <&cpg 614>; + iommus = <&ipmmu_vp1 1>; }; vspbd: vsp@fe960000 {