aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2010-12-07 17:14:44 -0200
committerSascha Hauer <s.hauer@pengutronix.de>2010-12-14 09:54:35 +0100
commitbfdde3a90b6d1c508e4f305dd385efd234fcdd66 (patch)
treee68b180061f339f8a89c9b2219811df728f0593a /arch/arm/mach-mx3
parentf25972233fbe4b60dc4b514def4caf40aa1bb85a (diff)
downloadkernel_samsung_crespo-bfdde3a90b6d1c508e4f305dd385efd234fcdd66.zip
kernel_samsung_crespo-bfdde3a90b6d1c508e4f305dd385efd234fcdd66.tar.gz
kernel_samsung_crespo-bfdde3a90b6d1c508e4f305dd385efd234fcdd66.tar.bz2
ARM: mx3/mx31_3ds: Add watchdog support
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3')
-rw-r--r--arch/arm/mach-mx3/Kconfig1
-rw-r--r--arch/arm/mach-mx3/mach-mx31_3ds.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/Kconfig b/arch/arm/mach-mx3/Kconfig
index 165e722..9037c4e 100644
--- a/arch/arm/mach-mx3/Kconfig
+++ b/arch/arm/mach-mx3/Kconfig
@@ -93,6 +93,7 @@ config MACH_MX31_3DS
select SOC_IMX31
select MXC_DEBUG_BOARD
select IMX_HAVE_PLATFORM_FSL_USB2_UDC
+ select IMX_HAVE_PLATFORM_IMX2_WDT
select IMX_HAVE_PLATFORM_IMX_KEYPAD
select IMX_HAVE_PLATFORM_IMX_UART
select IMX_HAVE_PLATFORM_MXC_NAND
diff --git a/arch/arm/mach-mx3/mach-mx31_3ds.c b/arch/arm/mach-mx3/mach-mx31_3ds.c
index e4efbfe..c488491 100644
--- a/arch/arm/mach-mx3/mach-mx31_3ds.c
+++ b/arch/arm/mach-mx3/mach-mx31_3ds.c
@@ -252,6 +252,7 @@ static void __init mxc_board_init(void)
if (mxc_expio_init(MX31_CS5_BASE_ADDR, EXPIO_PARENT_INT))
printk(KERN_WARNING "Init of the debug board failed, all "
"devices on the debug board are unusable.\n");
+ imx31_add_imx2_wdt(NULL);
}
static void __init mx31_3ds_timer_init(void)