diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-16 23:24:21 +0100 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-19 21:54:36 +0100 |
| commit | c496fa6bd5324ddce11e5e42670618ffb4d8f58d (patch) | |
| tree | b19f0ffccf9439a7a9a26a7584bfd0099d82391c /arch | |
| parent | d690b4c4778096cde018709efd005dfef9714297 (diff) | |
| download | kernel_samsung_crespo-c496fa6bd5324ddce11e5e42670618ffb4d8f58d.zip kernel_samsung_crespo-c496fa6bd5324ddce11e5e42670618ffb4d8f58d.tar.gz kernel_samsung_crespo-c496fa6bd5324ddce11e5e42670618ffb4d8f58d.tar.bz2 | |
ARM: mx3/mx35_3ds: Add watchdog support
This bases on a patch by Fabio Estevam who added the device before it
was allocated dynamically.
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mx3/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-mx3/mach-mx35_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 84e4788..8df139f 100644 --- a/arch/arm/mach-mx3/Kconfig +++ b/arch/arm/mach-mx3/Kconfig @@ -178,6 +178,7 @@ config MACH_MX35_3DS select MXC_DEBUG_BOARD select IMX_HAVE_PLATFORM_ESDHC select IMX_HAVE_PLATFORM_FSL_USB2_UDC + select IMX_HAVE_PLATFORM_IMX2_WDT select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_MXC_EHCI select IMX_HAVE_PLATFORM_MXC_NAND diff --git a/arch/arm/mach-mx3/mach-mx35_3ds.c b/arch/arm/mach-mx3/mach-mx35_3ds.c index 73fb115..d5ca7ea 100644 --- a/arch/arm/mach-mx3/mach-mx35_3ds.c +++ b/arch/arm/mach-mx3/mach-mx35_3ds.c @@ -140,6 +140,7 @@ static void __init mxc_board_init(void) mxc_iomux_v3_setup_multiple_pads(mx35pdk_pads, ARRAY_SIZE(mx35pdk_pads)); imx35_add_fec(NULL); + imx35_add_imx2_wdt(NULL); platform_add_devices(devices, ARRAY_SIZE(devices)); imx35_add_imx_uart0(&uart_pdata); |