diff options
| author | Alex Gonzalez <alex.gonzalez@digi.com> | 2012-01-13 10:39:09 +0100 |
|---|---|---|
| committer | Alex Gonzalez <alex.gonzalez@digi.com> | 2012-01-13 10:39:09 +0100 |
| commit | ba42870dcb2afc3847e1850b340370dd78ef61a6 (patch) | |
| tree | ce33e930c00a98e196e8deaad05e0cb13c33e733 /arch | |
| parent | d517609dfc8a5d84227f3993606ed3a460e697e9 (diff) | |
mxc: Add enable warm reset option.
Newer U-Boot will set cold resets by defaults. This commit allows a
kernel override back to the default setting.
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mx5/Kconfig | 11 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/system.c | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig index c53b71e31518..a85628fc4ebc 100644 --- a/arch/arm/mach-mx5/Kconfig +++ b/arch/arm/mach-mx5/Kconfig @@ -275,13 +275,14 @@ config MXC_BLUETOOTH_RFKILL ---help--- Say Y to get the standard rfkill interface of Bluetooth -config MXC_DISABLE_WARM_RESET - bool "Disable warm reset" +config MXC_ENABLE_WARM_RESET + bool "Enable warm reset" default n help - This forces all reset sources to be cold resets. Select if you are - seeing reboot problems. The memory won't be refreshed so it won't be - available across resets. + This makes reset sources to be warm resets. Select if you need + memory persistency across reboots. + + If not sure, say N. config CCXMX5X_PM_POWER_BUTTON bool "Enable power button for suspend/resume to RAM" diff --git a/arch/arm/plat-mxc/system.c b/arch/arm/plat-mxc/system.c index d6068c8e2227..98ceed280c4e 100644 --- a/arch/arm/plat-mxc/system.c +++ b/arch/arm/plat-mxc/system.c @@ -65,8 +65,8 @@ void arch_reset(char mode, const char *cmd) if (dvfs_core_is_active) stop_dvfs(); -#ifdef CONFIG_MXC_DISABLE_WARM_RESET - __raw_writel(__raw_readl(IO_ADDRESS(SRC_BASE_ADDR) + 0x0) & ~0x1 , +#ifdef CONFIG_MXC_ENABLE_WARM_RESET + __raw_writel(__raw_readl(IO_ADDRESS(SRC_BASE_ADDR) + 0x0) | 0x1 , IO_ADDRESS(SRC_BASE_ADDR) + 0x0); #endif |