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

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

ARM: imx legacy: pcm043: 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 c217147b
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -363,7 +363,6 @@ static void __init pcm043_init(void)

	imx35_add_imx_uart0(&uart_pdata);
	imx35_add_mxc_nand(&pcm037_nand_board_info);
	imx35_add_imx_ssi(0, &pcm043_ssi_pdata);

	imx35_add_imx_uart1(&uart_pdata);

@@ -387,6 +386,12 @@ static void __init pcm043_init(void)
		imx35_add_fsl_usb2_udc(&otg_device_pdata);

	imx35_add_flexcan1();
}

static void __init pcm043_late_init(void)
{
	imx35_add_imx_ssi(0, &pcm043_ssi_pdata);

	imx35_add_sdhci_esdhc_imx(0, &sd1_pdata);
}

@@ -403,5 +408,6 @@ MACHINE_START(PCM043, "Phytec Phycore pcm043")
	.init_irq = mx35_init_irq,
	.init_time = pcm043_timer_init,
	.init_machine	= pcm043_init,
	.init_late	= pcm043_late_init,
	.restart	= mxc_restart,
MACHINE_END