diff options
author | hdoyu@nvidia.com <hdoyu@nvidia.com> | 2012-05-16 15:47:46 -0400 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2012-06-11 13:48:42 -0400 |
commit | bfb3fe12667244d2c51699608a1591f1fdb774e5 (patch) | |
tree | 3590a2b51829f762b0bf7c8c83f2d2ca33a56866 | |
parent | eed6e344aeacd7cddbffd8e6ff4432f339bcc2bb (diff) |
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>
-rw-r--r-- | arch/arm/boot/dts/tegra-seaboard.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra20.dtsi | 2 |
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 @@ | |||
334 | }; | 334 | }; |
335 | }; | 335 | }; |
336 | 336 | ||
337 | emc { | 337 | memory-controller@0x7000f400 { |
338 | emc-table@190000 { | 338 | emc-table@190000 { |
339 | reg = <190000>; | 339 | reg = <190000>; |
340 | compatible = "nvidia,tegra20-emc-table"; | 340 | 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 @@ | |||
177 | 0x58000000 0x02000000>; /* GART aperture */ | 177 | 0x58000000 0x02000000>; /* GART aperture */ |
178 | }; | 178 | }; |
179 | 179 | ||
180 | emc { | 180 | memory-controller@0x7000f400 { |
181 | compatible = "nvidia,tegra20-emc"; | 181 | compatible = "nvidia,tegra20-emc"; |
182 | reg = <0x7000f400 0x200>; | 182 | reg = <0x7000f400 0x200>; |
183 | #address-cells = <1>; | 183 | #address-cells = <1>; |