aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2010-12-07 14:14:45 -0500
committerSascha Hauer <s.hauer@pengutronix.de>2010-12-14 03:54:37 -0500
commit8be9252f7ccde4148e4b203bf64d38ae66b111e4 (patch)
treeb0be105178b1bd44e965d75825dd29ad577d3c1e
parentbfdde3a90b6d1c508e4f305dd385efd234fcdd66 (diff)
ARM: imx/mx27_3ds: Add watchdog support
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-imx/Kconfig1
-rw-r--r--arch/arm/mach-imx/mach-mx27_3ds.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 8a9de1751b79..fed3ee526a05 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -235,6 +235,7 @@ endchoice
235config MACH_MX27_3DS 235config MACH_MX27_3DS
236 bool "MX27PDK platform" 236 bool "MX27PDK platform"
237 select SOC_IMX27 237 select SOC_IMX27
238 select IMX_HAVE_PLATFORM_IMX2_WDT
238 select IMX_HAVE_PLATFORM_IMX_KEYPAD 239 select IMX_HAVE_PLATFORM_IMX_KEYPAD
239 select IMX_HAVE_PLATFORM_IMX_UART 240 select IMX_HAVE_PLATFORM_IMX_UART
240 select IMX_HAVE_PLATFORM_MXC_MMC 241 select IMX_HAVE_PLATFORM_MXC_MMC
diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c
index 3614e33f8b6f..1a7e879a4543 100644
--- a/arch/arm/mach-imx/mach-mx27_3ds.c
+++ b/arch/arm/mach-imx/mach-mx27_3ds.c
@@ -127,6 +127,7 @@ static void __init mx27pdk_init(void)
127 imx27_add_fec(NULL); 127 imx27_add_fec(NULL);
128 imx27_add_imx_keypad(&mx27_3ds_keymap_data); 128 imx27_add_imx_keypad(&mx27_3ds_keymap_data);
129 imx27_add_mxc_mmc(0, &sdhc1_pdata); 129 imx27_add_mxc_mmc(0, &sdhc1_pdata);
130 imx27_add_imx2_wdt(NULL);
130} 131}
131 132
132static void __init mx27pdk_timer_init(void) 133static void __init mx27pdk_timer_init(void)