From patchwork Mon Oct 13 10:33:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 5075281 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7F46CC11AC for ; Mon, 13 Oct 2014 10:38:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B12FD201C7 for ; Mon, 13 Oct 2014 10:38:51 +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 C006B200F0 for ; Mon, 13 Oct 2014 10:38:50 +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 1XdczH-0001Nh-VU; Mon, 13 Oct 2014 10:36:23 +0000 Received: from mail-wi0-x232.google.com ([2a00:1450:400c:c05::232]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XdcxQ-0007FF-NS for linux-arm-kernel@lists.infradead.org; Mon, 13 Oct 2014 10:34:31 +0000 Received: by mail-wi0-f178.google.com with SMTP id h11so3308271wiw.17 for ; Mon, 13 Oct 2014 03:34:06 -0700 (PDT) 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=pKlMcvsxB5sHZQ1kL22fpvgZjVJaRcV7qiPqnNrFWbA=; b=MPG5WoypKdZsu0SFHbnR+a+wpJDd7W507CRBRNTsnOGBEVs4KjuE4mfI0Z4SvtQ3dC xDFTbVhYn6WfgAqrJbvYAz3q8bq7F/DtP7rN2H1I5j2zT9uMY0VA7cnLhqpANYEcJ0Ll zE1zhI3wE5SmKJ9qD8EC9UUgsy0MOP3kUO9Zxw9oIV2KCsTxzuSDroSjDcSQwXuBPNmN iORl6fitsUeLwEF7MP+Yi0q6ooN3qUZzwpAgITIC12ux12av660dCXogT8Gizb/m4Wc1 kusmTGXzcMO7gXnbpef7AEaqxm2+RiorVCc53+f8UpnbmTCwZd/FyfWshdWU61oqsB9d hwpQ== X-Received: by 10.180.103.104 with SMTP id fv8mr3253129wib.59.1413196446689; Mon, 13 Oct 2014 03:34:06 -0700 (PDT) Received: from localhost (port-4359.pppoe.wtnet.de. [84.46.17.24]) by mx.google.com with ESMTPSA id ei1sm11687447wib.20.2014.10.13.03.34.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Oct 2014 03:34:06 -0700 (PDT) From: Thierry Reding To: linux-tegra@vger.kernel.org Subject: [PATCH 07/12] ARM: tegra: Add memory controller support for Tegra30 Date: Mon, 13 Oct 2014 12:33:49 +0200 Message-Id: <1413196434-5292-7-git-send-email-thierry.reding@gmail.com> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1413196434-5292-1-git-send-email-thierry.reding@gmail.com> References: <1413196434-5292-1-git-send-email-thierry.reding@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141013_033428_957042_A477F060 X-CRM114-Status: GOOD ( 12.14 ) X-Spam-Score: -0.1 (/) Cc: Alexandre Courbot , Joerg Roedel , iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, Stephen Warren 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=-1.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=no 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 Collapses the old memory-controller and IOMMU device tree nodes into a single node to more accurately describe the hardware. While this is an incompatible change there are no users of the IOMMU on Tegra, even though a driver has existed for some time. Signed-off-by: Thierry Reding --- arch/arm/boot/dts/tegra30.dtsi | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi index aa6ccea13d30..fa7e5b642434 100644 --- a/arch/arm/boot/dts/tegra30.dtsi +++ b/arch/arm/boot/dts/tegra30.dtsi @@ -623,23 +623,15 @@ clock-names = "pclk", "clk32k_in"; }; - memory-controller@7000f000 { + mc: memory-controller@7000f000 { compatible = "nvidia,tegra30-mc"; - reg = <0x7000f000 0x010 - 0x7000f03c 0x1b4 - 0x7000f200 0x028 - 0x7000f284 0x17c>; + reg = <0x7000f000 0x400>; + clocks = <&tegra_car TEGRA30_CLK_MC>; + clock-names = "mc"; + interrupts = ; - }; - iommu@7000f010 { - compatible = "nvidia,tegra30-smmu"; - reg = <0x7000f010 0x02c - 0x7000f1f0 0x010 - 0x7000f228 0x05c>; - nvidia,#asids = <4>; /* # of ASIDs */ - dma-window = <0 0x40000000>; /* IOVA start & length */ - nvidia,ahb = <&ahb>; + #iommu-cells = <1>; }; fuse@7000f800 {