From patchwork Mon Jan 18 05:08:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 8052291 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-renesas-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 42AD69F1CC for ; Mon, 18 Jan 2016 05:06:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9AD4A2024C for ; Mon, 18 Jan 2016 05:06:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ED23E2022D for ; Mon, 18 Jan 2016 05:06:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750796AbcARFGk (ORCPT ); Mon, 18 Jan 2016 00:06:40 -0500 Received: from mail-pf0-f174.google.com ([209.85.192.174]:35327 "EHLO mail-pf0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750775AbcARFGk (ORCPT ); Mon, 18 Jan 2016 00:06:40 -0500 Received: by mail-pf0-f174.google.com with SMTP id 65so151267978pff.2 for ; Sun, 17 Jan 2016 21:06:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=JOXC7KOnZH3dZgO+majxyGexADGSIwkENAtR8hgit60=; b=Pxty0aFt78hr26b2xcOoqJS+ViQv6Ng561rz93a4H+Z9lWN9SaQ1IvxbsTv4Pl7Sup yLeccAa/WA9xewC0XMc0XKBHKWOin6N267W2QHGEPk1zb1JHphGoIavLWDG/xjjdbZi9 cLb/w1ZWIdaM3P1LoZlzMrAyQoyddUDAanpJGYQeo6WyQsZGdWk8HyrZNOvQU0NVd0xF 8cfeaMItD5CIm9LPh0h4Ed6RDeGmaclL5zz9/6Ka/uqM10mHPnKc5aBAt4ZtwY4ZXa5y oZHsWCHJi+1/WkuPxxkgB2LeuCTzoQ8ANkuN7PwHeE55RUloL17ht1K9Eqe3VFHwlTjh Rr+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:date:message-id:in-reply-to :references:subject; bh=JOXC7KOnZH3dZgO+majxyGexADGSIwkENAtR8hgit60=; b=hDJl0628uWI+geNn5SkHIS5w4cENj4C4wHzzdrtYHxxozwcD8iK3nyTmI47t16nAkC UasWikitb+IAh+WMzLOhboGepcsb+TFR8ZuI2vCkYW28NFhThbSAcTyNEvm3sn1LKAd4 y02l4o5hd+3paOQj2QrqWtDuo78HBMSwTobvzW9mLucI0XGbJZJKDlmDg019LZq6c8Uv Zi36PvrMrYgMiPYvBsZbQ/ES8tcdb8xvCEmVswxNIOYQWqFfxzEyDHuByOt55T5LlHOU OvJPP98IKrJXqa0NwtLC5gI+ycdQvKuIC+JkxEQD/629xUaGq69Jfd1PStsHU9v3i4cY z9Xg== X-Gm-Message-State: ALoCoQkFlASn5/l+DHuIuo+rIMAvsu/MO/dMYXj3hs/FpfWPdq7m54OH+XmBH/MhZiwklf1FYAFLSnjpdCqeBFw8sxKKOHkTSQ== X-Received: by 10.98.10.198 with SMTP id 67mr33815345pfk.75.1453093599825; Sun, 17 Jan 2016 21:06:39 -0800 (PST) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by smtp.gmail.com with ESMTPSA id k74sm30392256pfb.30.2016.01.17.21.06.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Jan 2016 21:06:38 -0800 (PST) From: Magnus Damm To: linux-renesas-soc@vger.kernel.org Cc: horms+renesas@verge.net.au, Magnus Damm , laurent.pinchart+renesas@ideasonboard.com, geert+renesas@glider.be Date: Mon, 18 Jan 2016 14:08:57 +0900 Message-Id: <20160118050857.20358.50375.sendpatchset@little-apple> In-Reply-To: <20160118050831.20358.83393.sendpatchset@little-apple> References: <20160118050831.20358.83393.sendpatchset@little-apple> Subject: [PATCH/RFC v2 03/03] ARM: shmobile: r8a7795: Tie in IPMMU with SYS-DMAC0 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Magnus Damm Hook up IPMMU-MM and IPMMU-DS0 to the r8a7795 DTS and make sure the SYS-DMAC0 is connected to IPMMU-DS0. The DT binding for the IPMMU will change. Not for upstream merge. Signed-off-by: Magnus Damm --- Changes since V1: - None arch/arm64/boot/dts/renesas/r8a7795.dtsi | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) --- 0023/arch/arm64/boot/dts/renesas/r8a7795.dtsi +++ work/arch/arm64/boot/dts/renesas/r8a7795.dtsi 2015-12-15 15:13:00.300513000 +0900 @@ -312,6 +312,22 @@ reg = <0 0xe6060000 0 0x50c>; }; + ipmmu_mm: mmu@e67b0000 { + compatible = "renesas,ipmmu-r8a7795"; + reg = <0 0xe67b0000 0 0x1000>; /* IPMMU-MM */ + interrupts = , + ; + #iommu-cells = <1>; + status = "okay"; + }; + + ipmmu_ds0: mmu@e6740000 { + compatible = "renesas,ipmmu-r8a7795"; + reg = <0 0xe6740000 0 0x1000>; /* IPMMU-DS0 */ + #iommu-cells = <1>; + status = "okay"; + }; + dmac0: dma-controller@e6700000 { compatible = "renesas,rcar-dmac"; reg = <0 0xe6700000 0 0x10000>; @@ -342,6 +358,14 @@ power-domains = <&cpg>; #dma-cells = <1>; dma-channels = <16>; + iommus = <&ipmmu_ds0 0>, <&ipmmu_ds0 1>, + <&ipmmu_ds0 2>, <&ipmmu_ds0 3>, + <&ipmmu_ds0 4>, <&ipmmu_ds0 5>, + <&ipmmu_ds0 6>, <&ipmmu_ds0 7>, + <&ipmmu_ds0 8>, <&ipmmu_ds0 9>, + <&ipmmu_ds0 10>, <&ipmmu_ds0 11>, + <&ipmmu_ds0 12>, <&ipmmu_ds0 13>, + <&ipmmu_ds0 14>, <&ipmmu_ds0 15>; }; dmac1: dma-controller@e7300000 {