summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorVladimir Zapolskiy <vz@mleia.com>2016-09-19 04:37:19 +0300
committerShawn Guo <shawnguo@kernel.org>2016-09-20 22:35:04 +0800
commitc5f9cfe60bd4763432e78780174fa6b6c5e82336 (patch)
tree6c039f91ceb297da9376e61f25d1c232bbf90676 /arch/arm/mach-imx
parentce689b0de5ec225e04eb9074888c3f2b16398c69 (diff)
downloadlinux-c5f9cfe60bd4763432e78780174fa6b6c5e82336.tar.gz
linux-c5f9cfe60bd4763432e78780174fa6b6c5e82336.tar.bz2
linux-c5f9cfe60bd4763432e78780174fa6b6c5e82336.zip
ARM: imx legacy: qong: 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: Vladimir Zapolskiy <vz@mleia.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r--arch/arm/mach-imx/mach-qong.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-qong.c b/arch/arm/mach-imx/mach-qong.c
index 34df64f133ed..8c2cbd693d21 100644
--- a/arch/arm/mach-imx/mach-qong.c
+++ b/arch/arm/mach-imx/mach-qong.c
@@ -251,7 +251,6 @@ static void __init qong_init(void)
mxc_init_imx_uart();
qong_init_nor_mtd();
- qong_init_fpga();
imx31_add_imx2_wdt();
}
@@ -268,5 +267,6 @@ MACHINE_START(QONG, "Dave/DENX QongEVB-LITE")
.init_irq = mx31_init_irq,
.init_time = qong_timer_init,
.init_machine = qong_init,
+ .init_late = qong_init_fpga,
.restart = mxc_restart,
MACHINE_END