From patchwork Thu Nov 13 09:32:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 5294741 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 251AD9F2F1 for ; Thu, 13 Nov 2014 09:39:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5B3902011E for ; Thu, 13 Nov 2014 09:39:35 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 77B07200EC for ; Thu, 13 Nov 2014 09:39:34 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xoqpp-0003ha-9i; Thu, 13 Nov 2014 09:37:01 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XoqmE-0007Br-JF for linux-arm-kernel@bombadil.infradead.org; Thu, 13 Nov 2014 09:33:18 +0000 Received: from mail-wi0-x230.google.com ([2a00:1450:400c:c05::230]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XoqmB-00041V-VN for linux-arm-kernel@lists.infradead.org; Thu, 13 Nov 2014 09:33:16 +0000 Received: by mail-wi0-f176.google.com with SMTP id ex7so306520wid.9 for ; Thu, 13 Nov 2014 01:32:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6i1dZrNGyjCb0Y9QRLgmoRcBDuVc9FTgii9nXSBfVpY=; b=wrHE57UxtkY9uZFsG/ZflNwG/b67QodF+lCfrFDAZ5yui9Ivl6tjjVbOKzcHgbN+QM uILE0ryT4mJfyrUGE/e0lzqV7A828WmaYlAl40xW3s5SLcuWt2s38WsRHwVNTMhAavvk iJ1ptae0xr8F2Xccn8mmv48HTtfNhRJUgQYdyYV21U3PPKY9ET5iemNb+5lZ2Bp9siIQ HGDGrx9nEZlepv4Qf0eN0T0Ww2q9senRXjTv7taI+jXeGkJErN2G8IDy551ukjmC6C8+ 7KOWdRpgrOWjqjGr4Ui1eDVFluw73PkJE0k6Fa0J22Mm7RYm1cROwichVN2JFnfu5UI/ E3qg== X-Received: by 10.194.5.227 with SMTP id v3mr2002172wjv.63.1415871174165; Thu, 13 Nov 2014 01:32:54 -0800 (PST) Received: from localhost (port-8254.pppoe.wtnet.de. [84.46.32.94]) by mx.google.com with ESMTPSA id ua8sm34781586wjc.7.2014.11.13.01.32.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Nov 2014 01:32:53 -0800 (PST) From: Thierry Reding To: Thierry Reding Subject: [PATCH v7 07/12] ARM: tegra: Add memory controller support for Tegra114 Date: Thu, 13 Nov 2014 10:32:32 +0100 Message-Id: <1415871157-21968-8-git-send-email-thierry.reding@gmail.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1415871157-21968-1-git-send-email-thierry.reding@gmail.com> References: <1415871157-21968-1-git-send-email-thierry.reding@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141113_093316_101147_47384A6C X-CRM114-Status: GOOD ( 12.84 ) X-Spam-Score: -2.7 (--) Cc: Alexandre Courbot , Russell King , Stephen Warren , Catalin Marinas , Joerg Roedel , Will Deacon , linux-tegra@vger.kernel.org, iommu@lists.linux-foundation.org, Olof Johansson , Mike Turquette , David Riley , Peter De Schrijver , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-3.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable 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: Thierry Reding Add the device tree node for the memory controller found on Tegra114 SoCs. The memory controller integrates an IOMMU (called SMMU) as well as various knobs to tweak memory accesses by the various clients. The old IOMMU device tree node is collapsed into the memory controller node to more accurately describe the hardware. While this change is incompatible, the IOMMU driver has never had any users so the change is not going to cause any breakage. Signed-off-by: Thierry Reding --- arch/arm/boot/dts/tegra114.dtsi | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi index 222f3b3f4dd5..e22eeca0979a 100644 --- a/arch/arm/boot/dts/tegra114.dtsi +++ b/arch/arm/boot/dts/tegra114.dtsi @@ -498,15 +498,15 @@ reset-names = "fuse"; }; - iommu@70019010 { - compatible = "nvidia,tegra114-smmu", "nvidia,tegra30-smmu"; - reg = <0x70019010 0x02c - 0x700191f0 0x010 - 0x70019228 0x074>; - nvidia,#asids = <4>; - dma-window = <0 0x40000000>; - nvidia,swgroups = <0x18659fe>; - nvidia,ahb = <&ahb>; + mc: memory-controller@70019000 { + compatible = "nvidia,tegra114-mc"; + reg = <0x70019000 0x1000>; + clocks = <&tegra_car TEGRA114_CLK_MC>; + clock-names = "mc"; + + interrupts = ; + + #iommu-cells = <1>; }; ahub@70080000 {