aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorhdoyu@nvidia.com <hdoyu@nvidia.com>2012-05-16 19:47:46 +0000
committerStephen Warren <swarren@nvidia.com>2012-06-11 11:48:42 -0600
commitbfb3fe12667244d2c51699608a1591f1fdb774e5 (patch)
tree3590a2b51829f762b0bf7c8c83f2d2ca33a56866 /arch/arm/boot
parentARM: tegra{20,30}: Rename "mc" to "memory-controller" (diff)
downloadlinux-dev-bfb3fe12667244d2c51699608a1591f1fdb774e5.tar.xz
linux-dev-bfb3fe12667244d2c51699608a1591f1fdb774e5.zip
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>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/tegra-seaboard.dts2
-rw-r--r--arch/arm/boot/dts/tegra20.dtsi2
2 files changed, 2 insertions, 2 deletions
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>;