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

Commit bfe16c89 authored by Vladimir Zapolskiy's avatar Vladimir Zapolskiy Committed by Shawn Guo
Browse files

ARM: imx legacy: mx21ads: move peripheral initialization to .init_late 



The change moves some of peripheral registrations and initializations
(all peripherals dependent on GPIOs) from .init_machine to .init_late
level, this allows to safely shift the shared GPIO controller driver
initialization level after init level of i.MX IOMUXC driver.

Signed-off-by: default avatarVladimir Zapolskiy <vz@mleia.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 782a8ee8

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

+9 −4
Original line number Diff line number Diff line
@@ -302,12 +302,16 @@ static void __init mx21ads_board_init(void) 
	imx21_add_imx_uart0(&uart_pdata_rts);

	imx21_add_imx_uart2(&uart_pdata_norts);

	imx21_add_imx_uart3(&uart_pdata_rts);

	imx21_add_mxc_mmc(0, &mx21ads_sdhc_pdata);

	imx21_add_mxc_nand(&mx21ads_nand_board_info);



	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));



	imx21_add_imx_fb(&mx21ads_fb_data);

}



static void __init mx21ads_late_init(void)

{

	imx21_add_mxc_mmc(0, &mx21ads_sdhc_pdata);



	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));



	mx21ads_cs8900_resources[1].start =

			gpio_to_irq(MX21ADS_CS8900A_IRQ_GPIO);
@@ -329,5 +333,6 @@ MACHINE_START(MX21ADS, "Freescale i.MX21ADS") 
	.init_irq = mx21_init_irq,

	.init_time	= mx21ads_timer_init,

	.init_machine	= mx21ads_board_init,

	.init_late	= mx21ads_late_init,

	.restart	= mxc_restart,

MACHINE_END