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

Commit 4f444e2b authored by Jochen Friedrich's avatar Jochen Friedrich Committed by Russell King
Browse files

ARM: 6606/1: sa1100: Fix platform device registration 



Since commit 7a5b4e16, simpad devices don't
boot anymore, since platform devices are registered too early. Fix by moving
the registration from map_io to arch_initcall as done on other sa1100 boards.

Signed-off-by: default avatarJochen Friedrich <jochen@scram.de>
Acked-by: default avatarKristoffer Ericson <kristoffer.ericson@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent b080ac8a

arch/arm/mach-sa1100/simpad.c

+4 −3
Original line number Diff line number Diff line
@@ -166,9 +166,6 @@ static void __init simpad_map_io(void) 
	PCFR = 0;

	PSDR = 0;



	sa11x0_register_mtd(&simpad_flash_data, simpad_flash_resources,

			      ARRAY_SIZE(simpad_flash_resources));

	sa11x0_register_mcp(&simpad_mcp_data);

}



static void simpad_power_off(void)
@@ -216,6 +213,10 @@ static int __init simpad_init(void) 


	pm_power_off = simpad_power_off;



	sa11x0_register_mtd(&simpad_flash_data, simpad_flash_resources,

			      ARRAY_SIZE(simpad_flash_resources));

	sa11x0_register_mcp(&simpad_mcp_data);



	ret = platform_add_devices(devices, ARRAY_SIZE(devices));

	if(ret)

		printk(KERN_WARNING "simpad: Unable to register mq200 framebuffer device");