arm: tegra: Re-enable system reset
Bug 790662
Original-Change-Id: I0c194455d4fb6e3326b60a14a5e459fe0e181c56
Reviewed-on: http://git-master/r/19158
Tested-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Change-Id: Ia91788b8ada6bcc411c3ee8c2ebf1ee717ca0199
Rebase-Id: R77131d678c4589b4731c0bc1fafd02174e69e561
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c
index 1fe12d7d..b94034e 100644
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@ -94,12 +94,12 @@
void (*arch_reset)(char mode, const char *cmd) = tegra_assert_system_reset;
-#define NEVER_RESET 1
+#define NEVER_RESET 0
void tegra_assert_system_reset(char mode, const char *cmd)
{
#if defined(CONFIG_TEGRA_FPGA_PLATFORM) || NEVER_RESET
- printk("tegra_assert_system_reset() call attempted on FPGA target platform.....");
+ printk("tegra_assert_system_reset() ignored.....");
do { } while (1);
#else
void __iomem *reset = IO_ADDRESS(TEGRA_PMC_BASE + 0x00);