diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2010-12-07 14:14:44 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-12-14 03:54:35 -0500 |
commit | bfdde3a90b6d1c508e4f305dd385efd234fcdd66 (patch) | |
tree | e68b180061f339f8a89c9b2219811df728f0593a /arch/arm/mach-mx3 | |
parent | f25972233fbe4b60dc4b514def4caf40aa1bb85a (diff) |
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/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-mx3/mach-mx31_3ds.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/Kconfig b/arch/arm/mach-mx3/Kconfig index 165e7221c500..9037c4e9bd34 100644 --- a/arch/arm/mach-mx3/Kconfig +++ b/arch/arm/mach-mx3/Kconfig | |||
@@ -93,6 +93,7 @@ config MACH_MX31_3DS | |||
93 | select SOC_IMX31 | 93 | select SOC_IMX31 |
94 | select MXC_DEBUG_BOARD | 94 | select MXC_DEBUG_BOARD |
95 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC | 95 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC |
96 | select IMX_HAVE_PLATFORM_IMX2_WDT | ||
96 | select IMX_HAVE_PLATFORM_IMX_KEYPAD | 97 | select IMX_HAVE_PLATFORM_IMX_KEYPAD |
97 | select IMX_HAVE_PLATFORM_IMX_UART | 98 | select IMX_HAVE_PLATFORM_IMX_UART |
98 | select IMX_HAVE_PLATFORM_MXC_NAND | 99 | 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 e4efbfe8795e..c488491bf938 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) | |||
252 | if (mxc_expio_init(MX31_CS5_BASE_ADDR, EXPIO_PARENT_INT)) | 252 | if (mxc_expio_init(MX31_CS5_BASE_ADDR, EXPIO_PARENT_INT)) |
253 | printk(KERN_WARNING "Init of the debug board failed, all " | 253 | printk(KERN_WARNING "Init of the debug board failed, all " |
254 | "devices on the debug board are unusable.\n"); | 254 | "devices on the debug board are unusable.\n"); |
255 | imx31_add_imx2_wdt(NULL); | ||
255 | } | 256 | } |
256 | 257 | ||
257 | static void __init mx31_3ds_timer_init(void) | 258 | static void __init mx31_3ds_timer_init(void) |