aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorPhilippe Rétornaz <philippe.retornaz@epfl.ch>2012-01-20 12:58:23 -0500
committerSascha Hauer <s.hauer@pengutronix.de>2012-03-02 02:38:44 -0500
commit31776fbc66fef50cad30dc65404145d254646172 (patch)
tree38b1deed553686222e6397bd6f2b378748556753 /arch/arm/mach-imx
parent0fbe6b07b77d85a02c63f5c5f5f3d08e79ec0e53 (diff)
mx31moboard: Add watchdog support
Signed-off-by: Philippe Rétornaz <philippe.retornaz@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r--arch/arm/mach-imx/Kconfig1
-rw-r--r--arch/arm/mach-imx/mach-mx31moboard.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 4defb97bbfc..d2e00f4cd38 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -492,6 +492,7 @@ config MACH_MX31MOBOARD
492 bool "Support mx31moboard platforms (EPFL Mobots group)" 492 bool "Support mx31moboard platforms (EPFL Mobots group)"
493 select SOC_IMX31 493 select SOC_IMX31
494 select IMX_HAVE_PLATFORM_FSL_USB2_UDC 494 select IMX_HAVE_PLATFORM_FSL_USB2_UDC
495 select IMX_HAVE_PLATFORM_IMX2_WDT
495 select IMX_HAVE_PLATFORM_IMX_I2C 496 select IMX_HAVE_PLATFORM_IMX_I2C
496 select IMX_HAVE_PLATFORM_IMX_UART 497 select IMX_HAVE_PLATFORM_IMX_UART
497 select IMX_HAVE_PLATFORM_IPU_CORE 498 select IMX_HAVE_PLATFORM_IPU_CORE
diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c
index ed0710b90d8..c0511fb1a5f 100644
--- a/arch/arm/mach-imx/mach-mx31moboard.c
+++ b/arch/arm/mach-imx/mach-mx31moboard.c
@@ -530,6 +530,8 @@ static void __init mx31moboard_init(void)
530 platform_add_devices(devices, ARRAY_SIZE(devices)); 530 platform_add_devices(devices, ARRAY_SIZE(devices));
531 gpio_led_register_device(-1, &mx31moboard_led_pdata); 531 gpio_led_register_device(-1, &mx31moboard_led_pdata);
532 532
533 imx31_add_imx2_wdt(NULL);
534
533 imx31_add_imx_uart0(&uart0_pdata); 535 imx31_add_imx_uart0(&uart0_pdata);
534 imx31_add_imx_uart4(&uart4_pdata); 536 imx31_add_imx_uart4(&uart4_pdata);
535 537