---

yaml --- r: 281654 b: refs/heads/master c: 9bfc3f0 h: refs/heads/master v: v3
git-mirror · Dec 18, 2011 · d2e62ad · d2e62ad
1 parent a0ebd8f
commit d2e62ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2385dc502a9c7eb3a7d0b8c033c344c459a13aa
+refs/heads/master: 9bfc3f0d48c0e6aac05b02638dd0b502b522dec7
diff --git a/trunk/arch/arm/mach-tegra/common.c b/trunk/arch/arm/mach-tegra/common.c
@@ -48,12 +48,11 @@ void __init tegra_dt_init_irq(void)
 
 void tegra_assert_system_reset(char mode, const char *cmd)
 {
-	void __iomem *reset = IO_ADDRESS(TEGRA_CLK_RESET_BASE + 0x04);
+	void __iomem *reset = IO_ADDRESS(TEGRA_PMC_BASE + 0);
 	u32 reg;
 
-	/* use *_related to avoid spinlock since caches are off */
 	reg = readl_relaxed(reset);
-	reg |= 0x04;
+	reg |= 0x10;
 	writel_relaxed(reg, reset);
 }