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>

diff --git a/arch/arm/mach-mx3/Kconfig b/arch/arm/mach-mx3/Kconfig
index 165e7221c500f8d4c2f682620e3ccbe15ec17732..9037c4e9bd34e45a714ebfa9ae7fdece622b8280 100644 (file)
--- 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 e4efbfe8795e05d08370d8099e9170addd41e412..c488491bf9387fe5e72c2e68db83769f107c9ee6 100644 (file)
--- 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)