summaryrefslogtreecommitdiffstats
path: root/arch/mips/bcm47xx
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2014-09-01 23:11:07 +0200
committerJohn W. Linville <linville@tuxdriver.com>2014-09-09 15:27:18 -0400
commita395135ddebb0a06052b84c309eb6cb68b79c797 (patch)
treed2d0582c1a5e1d260b91d40515b914c4a0b968f8 /arch/mips/bcm47xx
parentdc8ecdd3a3fccf73fcb07711cde064ce5727f9d1 (diff)
downloadop-kernel-dev-a395135ddebb0a06052b84c309eb6cb68b79c797.zip
op-kernel-dev-a395135ddebb0a06052b84c309eb6cb68b79c797.tar.gz
bcma: use separated function to initialize bus on SoC
This is required to split SoC bus init into two phases. The later one (which includes scanning) should be called when kalloc is available. Cc: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Acked-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'arch/mips/bcm47xx')
-rw-r--r--arch/mips/bcm47xx/setup.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c
index 2b63e7e..fff6ed4 100644
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -202,6 +202,10 @@ static void __init bcm47xx_register_bcma(void)
err = bcma_host_soc_register(&bcm47xx_bus.bcma);
if (err)
+ panic("Failed to register BCMA bus (err %d)", err);
+
+ err = bcma_host_soc_init(&bcm47xx_bus.bcma);
+ if (err)
panic("Failed to initialize BCMA bus (err %d)", err);
bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL);
OpenPOWER on IntegriCloud