From 8a3c2b3e00b111ba4ba71a703ed056ffa944b5ff Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Thu, 17 Feb 2011 08:13:57 -0800
Subject: [PATCH] --- yaml --- r: 235234 b: refs/heads/master c:
 375b19cd34ea9b1ab338deac20b4bd2c553bf57b h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/mach-tegra/common.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 12b19b25e761..0ba7e9d9efb5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ca00347c579f15b0eea1a6d4bab84e2cf56e745
+refs/heads/master: 375b19cd34ea9b1ab338deac20b4bd2c553bf57b
diff --git a/trunk/arch/arm/mach-tegra/common.c b/trunk/arch/arm/mach-tegra/common.c
index 34559d157827..54826b805b91 100644
--- a/trunk/arch/arm/mach-tegra/common.c
+++ b/trunk/arch/arm/mach-tegra/common.c
@@ -39,9 +39,10 @@ void tegra_assert_system_reset(char mode, const char *cmd)
 	void __iomem *reset = IO_ADDRESS(TEGRA_CLK_RESET_BASE + 0x04);
 	u32 reg;
 
-	reg = readl(reset);
+	/* use *_related to avoid spinlock since caches are off */
+	reg = readl_relaxed(reset);
 	reg |= 0x04;
-	writel(reg, reset);
+	writel_relaxed(reg, reset);
 }
 
 static __initdata struct tegra_clk_init_table common_clk_init_table[] = {