diff options
| author |   Eric Bénard <eric@eukrea.com> | 2012-05-08 09:20:21 +0200 |
|---|---|---|
| committer |   Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-08 17:31:24 +0200 |
| commit | f5c85d922c8407315d6a5b100ddb89db26938914 (patch) | |
| tree | a6c78a492b6e59cc3c422f7a8813620f53fb7fe7 | |
| parent | ARM: imx: eukrea-cpuimx51: remove board (diff) | |
| download | linux-dev-f5c85d922c8407315d6a5b100ddb89db26938914.tar.xz linux-dev-f5c85d922c8407315d6a5b100ddb89db26938914.zip | |
ARM: imx: eukrea_cpuimx51sd: add watchdog support
Signed-off-by: Eric Bénard <eric@eukrea.com>
Cc: Sascha Hauer <kernel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-imx/mach-cpuimx51sd.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 2f824d81030b..96b1c771c784 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -691,6 +691,7 @@ config MACH_EUKREA_CPUIMX51SD select IMX_HAVE_PLATFORM_FSL_USB2_UDC select IMX_HAVE_PLATFORM_IMX_I2C select IMX_HAVE_PLATFORM_IMX_UART + select IMX_HAVE_PLATFORM_IMX2_WDT select IMX_HAVE_PLATFORM_MXC_EHCI select IMX_HAVE_PLATFORM_MXC_NAND select IMX_HAVE_PLATFORM_SPI_IMX diff --git a/arch/arm/mach-imx/mach-cpuimx51sd.c b/arch/arm/mach-imx/mach-cpuimx51sd.c index 9fbe923c8b08..3e1d9fe1508b 100644 --- a/arch/arm/mach-imx/mach-cpuimx51sd.c +++ b/arch/arm/mach-imx/mach-cpuimx51sd.c @@ -272,6 +272,7 @@ static void __init eukrea_cpuimx51sd_init(void) imx51_add_imx_uart(0, &uart_pdata); imx51_add_mxc_nand(&eukrea_cpuimx51sd_nand_board_info); + imx51_add_imx2_wdt(0, NULL); gpio_request(ETH_RST, "eth_rst"); gpio_set_value(ETH_RST, 1); |