From: Thierry Reding <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> To: Thierry Reding <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Cc: Alexandre Courbot <gnurou-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>, Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>, Catalin Marinas <catalin.marinas-5wv7dgnIgG8@public.gmane.org>, Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>, linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, Mike Turquette <mturquette-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>, David Riley <davidriley-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>, Peter De Schrijver <pdeschrijver-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org Subject: [PATCH v6 07/12] ARM: tegra: Add memory controller support for Tegra114 Date: Fri, 7 Nov 2014 17:00:58 +0100 [thread overview] Message-ID: <1415376063-17205-8-git-send-email-thierry.reding@gmail.com> (raw) In-Reply-To: <1415376063-17205-1-git-send-email-thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> From: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 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 <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> --- 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 2ca9c1807f72..2c26b07c11ed 100644 --- a/arch/arm/boot/dts/tegra114.dtsi +++ b/arch/arm/boot/dts/tegra114.dtsi @@ -505,15 +505,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 = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>; + + #iommu-cells = <1>; }; ahub@70080000 { -- 2.1.3
WARNING: multiple messages have this Message-ID (diff)
From: thierry.reding@gmail.com (Thierry Reding) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 07/12] ARM: tegra: Add memory controller support for Tegra114 Date: Fri, 7 Nov 2014 17:00:58 +0100 [thread overview] Message-ID: <1415376063-17205-8-git-send-email-thierry.reding@gmail.com> (raw) In-Reply-To: <1415376063-17205-1-git-send-email-thierry.reding@gmail.com> From: Thierry Reding <treding@nvidia.com> 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 <treding@nvidia.com> --- 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 2ca9c1807f72..2c26b07c11ed 100644 --- a/arch/arm/boot/dts/tegra114.dtsi +++ b/arch/arm/boot/dts/tegra114.dtsi @@ -505,15 +505,15 @@ reset-names = "fuse"; }; - iommu at 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 at 70019000 { + compatible = "nvidia,tegra114-mc"; + reg = <0x70019000 0x1000>; + clocks = <&tegra_car TEGRA114_CLK_MC>; + clock-names = "mc"; + + interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>; + + #iommu-cells = <1>; }; ahub at 70080000 { -- 2.1.3
next prev parent reply other threads:[~2014-11-07 16:00 UTC|newest] Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-11-07 16:00 [PATCH v6 00/12] NVIDIA Tegra memory controller and IOMMU support Thierry Reding 2014-11-07 16:00 ` Thierry Reding [not found] ` <1415376063-17205-1-git-send-email-thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2014-11-07 16:00 ` [PATCH v6 01/12] clk: tegra: Implement memory-controller clock Thierry Reding 2014-11-07 16:00 ` Thierry Reding 2014-11-07 16:00 ` [PATCH v6 02/12] amba: Add Kconfig file Thierry Reding 2014-11-07 16:00 ` Thierry Reding 2014-11-07 16:00 ` [PATCH v6 03/12] ARM: tegra: Move AHB Kconfig to drivers/amba Thierry Reding 2014-11-07 16:00 ` Thierry Reding 2014-11-07 16:00 ` [PATCH v6 04/12] of: Add NVIDIA Tegra memory controller binding Thierry Reding 2014-11-07 16:00 ` Thierry Reding 2014-11-07 16:00 ` [PATCH v6 05/12] memory: Add NVIDIA Tegra memory controller support Thierry Reding [not found] ` <1415376063-17205-6-git-send-email-thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2014-11-12 14:21 ` Joerg Roedel 2014-11-12 14:21 ` Joerg Roedel [not found] ` <20141112142150.GV10744-zLv9SwRftAIdnm+yROfE0A@public.gmane.org> 2014-11-12 14:47 ` Thierry Reding 2014-11-12 14:47 ` Thierry Reding 2014-11-12 15:02 ` Joerg Roedel 2014-11-12 15:02 ` Joerg Roedel [not found] ` <20141112150233.GW10744-zLv9SwRftAIdnm+yROfE0A@public.gmane.org> 2014-11-12 15:09 ` Thierry Reding 2014-11-12 15:09 ` Thierry Reding 2014-11-07 16:00 ` [PATCH v6 06/12] ARM: tegra: Add memory controller support for Tegra30 Thierry Reding 2014-11-07 16:00 ` Thierry Reding 2014-11-07 16:00 ` Thierry Reding [this message] 2014-11-07 16:00 ` [PATCH v6 07/12] ARM: tegra: Add memory controller support for Tegra114 Thierry Reding 2014-11-07 16:00 ` [PATCH v6 08/12] ARM: tegra: Add memory controller support for Tegra124 Thierry Reding 2014-11-07 16:00 ` Thierry Reding 2014-11-07 16:01 ` [PATCH v6 09/12] ARM: tegra: Enable IOMMU for display controllers on Tegra30 Thierry Reding 2014-11-07 16:01 ` Thierry Reding 2014-11-07 16:01 ` [PATCH v6 10/12] ARM: tegra: Enable IOMMU for display controllers on Tegra114 Thierry Reding 2014-11-07 16:01 ` Thierry Reding 2014-11-07 16:01 ` [PATCH v6 11/12] ARM: tegra: Enable IOMMU for display controllers on Tegra124 Thierry Reding 2014-11-07 16:01 ` Thierry Reding 2014-11-07 16:01 ` [PATCH v6 12/12] memory: tegra: Add Tegra132 support Thierry Reding 2014-11-07 16:01 ` Thierry Reding 2014-11-10 9:53 ` [PATCH v6 00/12] NVIDIA Tegra memory controller and IOMMU support Alexandre Courbot 2014-11-10 9:53 ` Alexandre Courbot
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1415376063-17205-8-git-send-email-thierry.reding@gmail.com \ --to=thierry.reding-re5jqeeqqe8avxtiumwx3w@public.gmane.org \ --cc=catalin.marinas-5wv7dgnIgG8@public.gmane.org \ --cc=davidriley-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org \ --cc=gnurou-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org \ --cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=mturquette-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \ --cc=pdeschrijver-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \ --cc=swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org \ --cc=will.deacon-5wv7dgnIgG8@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.