diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-02 14:48:53 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-02 14:48:53 +0000 |
| commit | 721d6d1ecc281541a7d89989779e02af09f13c13 (patch) | |
| tree | 85d0e22c19359df5fe1a50c74c9be1f9f46d4007 /arch | |
| parent | 622e695886cfede6aea0ee8ba74e1b8a4c8c01e0 (diff) | |
| parent | 31776fbc66fef50cad30dc65404145d254646172 (diff) | |
| download | blackbird-obmc-linux-721d6d1ecc281541a7d89989779e02af09f13c13.tar.gz blackbird-obmc-linux-721d6d1ecc281541a7d89989779e02af09f13c13.zip | |
Merge branch 'features/imx31-moboard' of git://git.pengutronix.de/git/imx/linux-2.6 into next/boards
* 'features/imx31-moboard' of git://git.pengutronix.de/git/imx/linux-2.6:
mx31moboard: Add watchdog support
mx31moboard: update maintainer
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-imx/mach-mx31moboard.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index a3125ac21425..96b1f62c3929 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -494,6 +494,7 @@ config MACH_MX31MOBOARD bool "Support mx31moboard platforms (EPFL Mobots group)" select SOC_IMX31 select IMX_HAVE_PLATFORM_FSL_USB2_UDC + select IMX_HAVE_PLATFORM_IMX2_WDT select IMX_HAVE_PLATFORM_IMX_I2C select IMX_HAVE_PLATFORM_IMX_UART 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 f225262b5c38..c0511fb1a5f9 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) platform_add_devices(devices, ARRAY_SIZE(devices)); gpio_led_register_device(-1, &mx31moboard_led_pdata); + imx31_add_imx2_wdt(NULL); + imx31_add_imx_uart0(&uart0_pdata); imx31_add_imx_uart4(&uart4_pdata); @@ -590,7 +592,7 @@ static void __init mx31moboard_reserve(void) } MACHINE_START(MX31MOBOARD, "EPFL Mobots mx31moboard") - /* Maintainer: Valentin Longchamp, EPFL Mobots group */ + /* Maintainer: Philippe Retornaz, EPFL Mobots group */ .atag_offset = 0x100, .reserve = mx31moboard_reserve, .map_io = mx31_map_io, |
