summaryrefslogtreecommitdiff
path: root/arch/arm/mach-cns3xxx/core.c
diff options
context:
space:
mode:
authorXia Kaixu <kaixu.xia@linaro.org>2014-09-03 21:18:12 +0800
committerArnd Bergmann <arnd@arndb.de>2014-09-04 23:39:57 +0200
commit0a2e912d296201c476fe5d7ba6ac23a66325935f (patch)
treeac87d60dde207d49e6c6da95e15c34e850603706 /arch/arm/mach-cns3xxx/core.c
parentc96bfaffb783b86555e13d97e871c2adeb97d613 (diff)
ARM: cns3xxx: fix allmodconfig panic in pci driver
The kernel panic occurs when running an allmodconfig kernel on OMAP4460. The inicall "cns3xxx_pcie_init" does not check which hardware it's running on and just tries to access to its specific registers. Now call it from .init_late callback from the two machine descriptors. Signed-off-by: Xia Kaixu <kaixu.xia@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Anton Vorontsov <anton@enomsg.org> Cc: Felix Fietkau <nbd@openwrt.org> Cc: Imre Kaloz <kaloz@openwrt.org> Cc: linaro-kernel@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org
Diffstat (limited to 'arch/arm/mach-cns3xxx/core.c')
-rw-r--r--arch/arm/mach-cns3xxx/core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-cns3xxx/core.c b/arch/arm/mach-cns3xxx/core.c
index f85449a6accd..4e9837ded96d 100644
--- a/arch/arm/mach-cns3xxx/core.c
+++ b/arch/arm/mach-cns3xxx/core.c
@@ -404,5 +404,6 @@ DT_MACHINE_START(CNS3XXX_DT, "Cavium Networks CNS3xxx")
.init_irq = cns3xxx_init_irq,
.init_time = cns3xxx_timer_init,
.init_machine = cns3xxx_init,
+ .init_late = cns3xxx_pcie_init_late,
.restart = cns3xxx_restart,
MACHINE_END