[ARM] tegra: Allow overriding arch_reset

Change-Id: Iba7ab5af149724dae8caab76f044e5b12d6b0436
Signed-off-by: Colin Cross <ccross@google.com>

diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c
index 7c91e2b9d643fa5c18e07a606a1b5a543645c383..f0ba3b4392553f106946a90563f541f59473a5da 100644 (file)
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@ -26,11 +26,14 @@
 
 #include <mach/iomap.h>
 #include <mach/dma.h>
+#include <mach/system.h>
 
 #include "board.h"
 #include "clock.h"
 #include "fuse.h"
 
+void (*tegra_reset)(char mode, const char *cmd);
+
 static __initdata struct tegra_clk_init_table common_clk_init_table[] = {
        /* name         parent          rate            enabled */
        { "clk_m",      NULL,           0,              true },

diff --git a/arch/arm/mach-tegra/include/mach/system.h b/arch/arm/mach-tegra/include/mach/system.h
index 84d5d46113f7457b4e6bf8d7bfcb54ec8f4a0a20..70c95ac93355db7727e9e0d3997dfb4edf654a8b 100644 (file)
--- a/arch/arm/mach-tegra/include/mach/system.h
+++ b/arch/arm/mach-tegra/include/mach/system.h
@@ -24,16 +24,30 @@
 #include <mach/hardware.h>
 #include <mach/iomap.h>
 
+extern void (*tegra_reset)(char mode, const char *cmd);
+
 static inline void arch_idle(void)
 {
 }
 
-static inline void arch_reset(char mode, const char *cmd)
+static inline void tegra_assert_system_reset(void)
 {
        void __iomem *reset = IO_ADDRESS(TEGRA_CLK_RESET_BASE + 0x04);
-       u32 reg = readl(reset);
+       u32 reg;
+
+       reg = readl(reset);
        reg |= 0x04;
        writel(reg, reset);
 }
 
+static inline void arch_reset(char mode, const char *cmd)
+{
+       if (tegra_reset)
+               tegra_reset(mode, cmd);
+       else
+               tegra_assert_system_reset();
+
+       do { } while (1);
+}
+
 #endif