diff options
| author | David Lechner <david@lechnology.com> | 2018-01-15 11:29:31 -0600 |
|---|---|---|
| committer | Sekhar Nori <nsekhar@ti.com> | 2018-02-26 11:41:53 +0530 |
| commit | 35ba26772c827dbfc03be8adc3af8ff0d294b38f (patch) | |
| tree | 5300f71d5efdbc5999e4a1baf8ebb325ea3727c0 /arch/arm/configs/davinci_all_defconfig | |
| parent | 6238030cc2b6b3a7af9a9bff8bf9903970d79537 (diff) | |
ARM: davinci_all_defconfig: set CONFIG_DAVINCI_WATCHDOG=y
This changes CONFIG_DAVINCI_WATCHDOG from a module to a compiled-in
option. Since the reset function has been moved out of the mach code in
commit 94f2e94514e5 ("ARM: davinci: remove watchdog reset") and into the
watchdog driver, devices cannot reboot unless the watchdog driver is
loaded, so make it a compiled-in option so that we can always reboot, even
when modules are not loaded.
Cc: Sekhar Nori <nsekhar@ti.com>
Suggested-by: Adam Ford <aford173@gmail.com>
Signed-off-by: David Lechner <david@lechnology.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm/configs/davinci_all_defconfig')
| -rw-r--r-- | arch/arm/configs/davinci_all_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index bcb70c2e550d..c302a04e8cbc 100644 --- a/arch/arm/configs/davinci_all_defconfig +++ b/arch/arm/configs/davinci_all_defconfig @@ -129,7 +129,7 @@ CONFIG_POWER_RESET_GPIO=y CONFIG_SYSCON_REBOOT_MODE=m CONFIG_BATTERY_LEGO_EV3=m CONFIG_WATCHDOG=y -CONFIG_DAVINCI_WATCHDOG=m +CONFIG_DAVINCI_WATCHDOG=y CONFIG_MFD_DM355EVM_MSP=y CONFIG_TPS6507X=y CONFIG_REGULATOR=y |