Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 721d6d1e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'features/imx31-moboard' of... 

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
parents 622e6958 31776fbc

arch/arm/mach-imx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-imx/mach-mx31moboard.c

+3 −1
Original line number Diff line number Diff line
@@ -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,