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: 399138 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A9C411400B7 for ; Mon, 13 Oct 2014 21:34:11 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753534AbaJMKeK (ORCPT ); Mon, 13 Oct 2014 06:34:10 -0400 Received: from mail-wg0-f41.google.com ([74.125.82.41]:53939 "EHLO mail-wg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753804AbaJMKeH (ORCPT ); Mon, 13 Oct 2014 06:34:07 -0400 Received: by mail-wg0-f41.google.com with SMTP id b13so8348825wgh.12 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 Cc: Joerg Roedel , Stephen Warren , Alexandre Courbot , iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.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> Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org 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 {