From 50e81c4a3d58ca4cdece0b60e88670d3d20d60c4 Mon Sep 17 00:00:00 2001 From: "hdoyu@nvidia.com" Date: Wed, 16 May 2012 19:47:44 +0000 Subject: [PATCH] --- yaml --- r: 313083 b: refs/heads/master c: a9140aa51dede09cefd51a6f578a100572e693b3 h: refs/heads/master i: 313081: 4bf483d8dcd832145f12b708cd3ad9f5ad8fa428 313079: 0f6287309f0936a69ccbea77cd89650bac870d4e v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/tegra20.dtsi | 2 +- trunk/arch/arm/boot/dts/tegra30.dtsi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d17bb228bd82..ac42afcf1a94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dec195dc41bd678a5626cca5d6c14ee338b5df77 +refs/heads/master: a9140aa51dede09cefd51a6f578a100572e693b3 diff --git a/trunk/arch/arm/boot/dts/tegra20.dtsi b/trunk/arch/arm/boot/dts/tegra20.dtsi index c417d67e9027..2d503d62ea3e 100644 --- a/trunk/arch/arm/boot/dts/tegra20.dtsi +++ b/trunk/arch/arm/boot/dts/tegra20.dtsi @@ -164,7 +164,7 @@ reg = <0x7000e400 0x400>; }; - mc { + memory-controller@0x7000f000 { compatible = "nvidia,tegra20-mc"; reg = <0x7000f000 0x024 0x7000f03c 0x3c4>; diff --git a/trunk/arch/arm/boot/dts/tegra30.dtsi b/trunk/arch/arm/boot/dts/tegra30.dtsi index 2dcc09e784b5..19479393842e 100644 --- a/trunk/arch/arm/boot/dts/tegra30.dtsi +++ b/trunk/arch/arm/boot/dts/tegra30.dtsi @@ -167,7 +167,7 @@ reg = <0x7000e400 0x400>; }; - mc { + memory-controller { compatible = "nvidia,tegra30-mc"; reg = <0x7000f000 0x010 0x7000f03c 0x1b4