diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2011-01-28 03:26:28 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:46:37 -0800 |
| commit | 9bc40536bf81a28b0770fb9040e8499c18f33e7f (patch) | |
| tree | 6566057a05b13c7327f9f6c36f3267c98c77306b /arch | |
| parent | a96fb972c4878aebead1e0cf081cc8046f828df7 (diff) | |
arm: tegra: Disable system reset
Temporarily disable the ability of the OS to reset the target.
Original-Change-Id: I12b3b7b1d66061bb17dcd9fabd4fd79395c37880
Reviewed-on: http://git-master/r/17464
Tested-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Change-Id: I36b7471965378a342d50369700ab5d439f80cf9d
Rebase-Id: Re38709f60b8082cd05b77a13c8c9012d8a6772b0
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/common.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c index a147863db5ad..1fe12d7d204a 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c @@ -94,9 +94,14 @@ static int board_panel_type; void (*arch_reset)(char mode, const char *cmd) = tegra_assert_system_reset; +#define NEVER_RESET 1 + void tegra_assert_system_reset(char mode, const char *cmd) { -#ifndef CONFIG_TEGRA_FPGA_PLATFORM +#if defined(CONFIG_TEGRA_FPGA_PLATFORM) || NEVER_RESET + printk("tegra_assert_system_reset() call attempted on FPGA target platform....."); + do { } while (1); +#else void __iomem *reset = IO_ADDRESS(TEGRA_PMC_BASE + 0x00); u32 reg; @@ -104,9 +109,6 @@ void tegra_assert_system_reset(char mode, const char *cmd) reg = readl_relaxed(reset); reg |= 0x10; writel_relaxed(reg, reset); -#else - printk("tegra_assert_system_reset() call attempted on FPGA target platform....."); - do { } while (1); #endif } |