From: hdoyu@nvidia.com <hdoyu@nvidia.com>
Date: Wed, 16 May 2012 19:47:46 +0000 (+0000)
Subject: ARM: dt: tegra20: Rename "emc" to "memory-controller"
X-Git-Tag: v3.6-rc1~134^2~4^2~7
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=bfb3fe12667244d2c51699608a1591f1fdb774e5;p=cascardo%2Flinux.git

ARM: dt: tegra20: Rename "emc" to "memory-controller"

Use a more plain english name.

Signed-off-by: Hiroshi DOYU <hdoyu@nvidia.com>
[swarren: also rename the node in tegra-seaboard.dts]
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---

diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts
index 89cb7f2acd92..743ef653afc3 100644
--- a/arch/arm/boot/dts/tegra-seaboard.dts
+++ b/arch/arm/boot/dts/tegra-seaboard.dts
@@ -334,7 +334,7 @@
 		};
 	};
 
-	emc {
+	memory-controller@0x7000f400 {
 		emc-table@190000 {
 			reg = <190000>;
 			compatible = "nvidia,tegra20-emc-table";
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index 2d503d62ea3e..59116b852434 100644
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -177,7 +177,7 @@
 		       0x58000000 0x02000000>;	/* GART aperture */
 	};
 
-	emc {
+	memory-controller@0x7000f400 {
 		compatible = "nvidia,tegra20-emc";
 		reg = <0x7000f400 0x200>;
 		#address-cells = <1>;