From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= Subject: [PATCH v4 8/8] ARM: dts: r8a7791: add iommus to dmac0 and dmac1 Date: Tue, 16 Feb 2016 21:39:44 +0100 Message-ID: <1455655184-14478-9-git-send-email-niklas.soderlund+renesas@ragnatech.se> References: <1455655184-14478-1-git-send-email-niklas.soderlund+renesas@ragnatech.se> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1455655184-14478-1-git-send-email-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: vinod.koul-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org, linux-renesas-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dmaengine-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Cc: linux-arch-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, =?UTF-8?q?Niklas=20S=C3=B6derlund?= , geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org, arnd-r2nGTMty4D4@public.gmane.org, linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org, dan.j.williams-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org List-Id: linux-arch.vger.kernel.org QSB1bmNvbmZpcm1lZCBoYXJkd2FyZSBidWcgcHJldmVudHMgY2hhbm5lbCAwIGFuZCAxNSB0byBi ZSB1c2VkIGJ5IHRoZQpETUFDIHRvZ2V0aGVyIHdpdGggdGhlIElQTU1VLiBUaGUgRE1BQyBkcml2 ZXIgd2lsbCBkaXNhYmxlIHRoZSBjaGFubmVscwpyZWR1Y2luZyB0aGUgZWZmZWN0aXZlIG51bWJl ciBvZiBjaGFubmVscyB0byAxNCBwZXIgRE1BQy4KClNpZ25lZC1vZmYtYnk6IE5pa2xhcyBTw7Zk ZXJsdW5kIDxuaWtsYXMuc29kZXJsdW5kK3JlbmVzYXNAcmFnbmF0ZWNoLnNlPgpBY2tlZC1ieTog TGF1cmVudCBQaW5jaGFydCA8bGF1cmVudC5waW5jaGFydEBpZGVhc29uYm9hcmQuY29tPgotLS0K IGFyY2gvYXJtL2Jvb3QvZHRzL3I4YTc3OTEuZHRzaSB8IDMwICsrKysrKysrKysrKysrKysrKysr KysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDMwIGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQg YS9hcmNoL2FybS9ib290L2R0cy9yOGE3NzkxLmR0c2kgYi9hcmNoL2FybS9ib290L2R0cy9yOGE3 NzkxLmR0c2kKaW5kZXggMmEzNjlkZC4uNmRmZjA2MSAxMDA2NDQKLS0tIGEvYXJjaC9hcm0vYm9v dC9kdHMvcjhhNzc5MS5kdHNpCisrKyBiL2FyY2gvYXJtL2Jvb3QvZHRzL3I4YTc3OTEuZHRzaQpA QCAtMjgzLDYgKzI4MywyMSBAQAogCQlwb3dlci1kb21haW5zID0gPCZjcGdfY2xvY2tzPjsKIAkJ I2RtYS1jZWxscyA9IDwxPjsKIAkJZG1hLWNoYW5uZWxzID0gPDE1PjsKKwkJaW9tbXVzID0gPCZp cG1tdV9kcyAwPiwKKwkJCSA8JmlwbW11X2RzIDE+LAorCQkJIDwmaXBtbXVfZHMgMj4sCisJCQkg PCZpcG1tdV9kcyAzPiwKKwkJCSA8JmlwbW11X2RzIDQ+LAorCQkJIDwmaXBtbXVfZHMgNT4sCisJ CQkgPCZpcG1tdV9kcyA2PiwKKwkJCSA8JmlwbW11X2RzIDc+LAorCQkJIDwmaXBtbXVfZHMgOD4s CisJCQkgPCZpcG1tdV9kcyA5PiwKKwkJCSA8JmlwbW11X2RzIDEwPiwKKwkJCSA8JmlwbW11X2Rz IDExPiwKKwkJCSA8JmlwbW11X2RzIDEyPiwKKwkJCSA8JmlwbW11X2RzIDEzPiwKKwkJCSA8Jmlw bW11X2RzIDE0PjsKIAl9OwogCiAJZG1hYzE6IGRtYS1jb250cm9sbGVyQGU2NzIwMDAwIHsKQEAg LTMxNCw2ICszMjksMjEgQEAKIAkJcG93ZXItZG9tYWlucyA9IDwmY3BnX2Nsb2Nrcz47CiAJCSNk bWEtY2VsbHMgPSA8MT47CiAJCWRtYS1jaGFubmVscyA9IDwxNT47CisJCWlvbW11cyA9IDwmaXBt bXVfZHMgMTU+LAorCQkJIDwmaXBtbXVfZHMgMTY+LAorCQkJIDwmaXBtbXVfZHMgMTc+LAorCQkJ IDwmaXBtbXVfZHMgMTg+LAorCQkJIDwmaXBtbXVfZHMgMTk+LAorCQkJIDwmaXBtbXVfZHMgMjA+ LAorCQkJIDwmaXBtbXVfZHMgMjE+LAorCQkJIDwmaXBtbXVfZHMgMjI+LAorCQkJIDwmaXBtbXVf ZHMgMjM+LAorCQkJIDwmaXBtbXVfZHMgMjQ+LAorCQkJIDwmaXBtbXVfZHMgMjU+LAorCQkJIDwm aXBtbXVfZHMgMjY+LAorCQkJIDwmaXBtbXVfZHMgMjc+LAorCQkJIDwmaXBtbXVfZHMgMjg+LAor CQkJIDwmaXBtbXVfZHMgMjk+OwogCX07CiAKIAlhdWRtYTA6IGRtYS1jb250cm9sbGVyQGVjNzAw MDAwIHsKLS0gCjIuNy4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwppb21tdSBtYWlsaW5nIGxpc3QKaW9tbXVAbGlzdHMubGludXgtZm91bmRhdGlvbi5v cmcKaHR0cHM6Ly9saXN0cy5saW51eGZvdW5kYXRpb24ub3JnL21haWxtYW4vbGlzdGluZm8vaW9t bXU= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-3.sys.kth.se ([130.237.48.192]:58101 "EHLO smtp-3.sys.kth.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932225AbcBPUkR (ORCPT ); Tue, 16 Feb 2016 15:40:17 -0500 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= Subject: [PATCH v4 8/8] ARM: dts: r8a7791: add iommus to dmac0 and dmac1 Date: Tue, 16 Feb 2016 21:39:44 +0100 Message-ID: <1455655184-14478-9-git-send-email-niklas.soderlund+renesas@ragnatech.se> In-Reply-To: <1455655184-14478-1-git-send-email-niklas.soderlund+renesas@ragnatech.se> References: <1455655184-14478-1-git-send-email-niklas.soderlund+renesas@ragnatech.se> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-arch-owner@vger.kernel.org List-ID: To: vinod.koul@intel.com, linux-renesas-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, iommu@lists.linux-foundation.org Cc: robin.murphy@arm.com, laurent.pinchart@ideasonboard.com, geert+renesas@glider.be, linus.walleij@linaro.org, dan.j.williams@intel.com, arnd@arndb.de, linux-arch@vger.kernel.org, =?UTF-8?q?Niklas=20S=C3=B6derlund?= Message-ID: <20160216203944.BjfmEwm52MZhG7c46njfwyD2tZw4YSearaXImqE65FI@z> A unconfirmed hardware bug prevents channel 0 and 15 to be used by the DMAC together with the IPMMU. The DMAC driver will disable the channels reducing the effective number of channels to 14 per DMAC. Signed-off-by: Niklas Söderlund Acked-by: Laurent Pinchart --- arch/arm/boot/dts/r8a7791.dtsi | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi index 2a369dd..6dff061 100644 --- a/arch/arm/boot/dts/r8a7791.dtsi +++ b/arch/arm/boot/dts/r8a7791.dtsi @@ -283,6 +283,21 @@ power-domains = <&cpg_clocks>; #dma-cells = <1>; dma-channels = <15>; + iommus = <&ipmmu_ds 0>, + <&ipmmu_ds 1>, + <&ipmmu_ds 2>, + <&ipmmu_ds 3>, + <&ipmmu_ds 4>, + <&ipmmu_ds 5>, + <&ipmmu_ds 6>, + <&ipmmu_ds 7>, + <&ipmmu_ds 8>, + <&ipmmu_ds 9>, + <&ipmmu_ds 10>, + <&ipmmu_ds 11>, + <&ipmmu_ds 12>, + <&ipmmu_ds 13>, + <&ipmmu_ds 14>; }; dmac1: dma-controller@e6720000 { @@ -314,6 +329,21 @@ power-domains = <&cpg_clocks>; #dma-cells = <1>; dma-channels = <15>; + iommus = <&ipmmu_ds 15>, + <&ipmmu_ds 16>, + <&ipmmu_ds 17>, + <&ipmmu_ds 18>, + <&ipmmu_ds 19>, + <&ipmmu_ds 20>, + <&ipmmu_ds 21>, + <&ipmmu_ds 22>, + <&ipmmu_ds 23>, + <&ipmmu_ds 24>, + <&ipmmu_ds 25>, + <&ipmmu_ds 26>, + <&ipmmu_ds 27>, + <&ipmmu_ds 28>, + <&ipmmu_ds 29>; }; audma0: dma-controller@ec700000 { -- 2.7.1