summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Robinson Jr <rrobinson@phytec.com>2013-07-30 16:38:37 -0700
committerAnthony Felice <tony.felice@timesys.com>2013-08-28 18:26:23 -0400
commit09ddcf195980d3126556f29174f14e79bbcd0fbe (patch)
treee544d1b61c4363425ff7e81c1d8ed3affbbbcf92
parent149a7e068482a062d8bdf933625d5bc883e982fd (diff)
pcm052: enable watchdog
Signed-off-by: Russell Robinson Jr <rrobinson@phytec.com>
-rw-r--r--arch/arm/configs/pcm052_defconfig15
-rw-r--r--arch/arm/mach-mvf/board-pcm052.c2
2 files changed, 15 insertions, 2 deletions
diff --git a/arch/arm/configs/pcm052_defconfig b/arch/arm/configs/pcm052_defconfig
index a7ac5d0acbbb..cf5c67f75198 100644
--- a/arch/arm/configs/pcm052_defconfig
+++ b/arch/arm/configs/pcm052_defconfig
@@ -1099,7 +1099,20 @@ CONFIG_GPIO_SYSFS=y
# CONFIG_POWER_SUPPLY is not set
# CONFIG_HWMON is not set
# CONFIG_THERMAL is not set
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_MAX63XX_WATCHDOG is not set
+CONFIG_IMX2_WDT=y
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
CONFIG_SSB_POSSIBLE=y
#
diff --git a/arch/arm/mach-mvf/board-pcm052.c b/arch/arm/mach-mvf/board-pcm052.c
index addae6c2a9d9..b73afc0028c5 100644
--- a/arch/arm/mach-mvf/board-pcm052.c
+++ b/arch/arm/mach-mvf/board-pcm052.c
@@ -518,7 +518,7 @@ static void __init pcm052_board_init(void)
mxc_register_device(&pcm052_audio_device, &pcm052_audio_data);
mvfa5_add_sai(2, &mvf_sai_pdata);
-// mvf_add_wdt(0);
+ mvf_add_wdt(0);
pcm052_init_usb();