summaryrefslogtreecommitdiff
path: root/arch/mips/bcm47xx/irq.c
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2014-10-28 14:40:38 +0100
committerRalf Baechle <ralf@linux-mips.org>2014-11-24 07:45:00 +0100
commite5810fa0c1bed16fdfb408862a2e17e962ec5cf6 (patch)
tree424fd47ac92e2696afe287a29dfc14f4fc5f399d /arch/mips/bcm47xx/irq.c
parenta59da8fb3b2a1f2df5f871464e43cd5b6ca6ceb1 (diff)
MIPS: BCM47XX: Initialize bcma bus later (with mm available)
Initializaion with memory allocator available will be much simpler, this will allow cleanup in the bcma code. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Acked-by: Hauke Mehrtens <hauke@hauke-m.de> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/8234/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/bcm47xx/irq.c')
-rw-r--r--arch/mips/bcm47xx/irq.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/mips/bcm47xx/irq.c b/arch/mips/bcm47xx/irq.c
index e0585b76ec19..21b4497f09be 100644
--- a/arch/mips/bcm47xx/irq.c
+++ b/arch/mips/bcm47xx/irq.c
@@ -22,6 +22,8 @@
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include "bcm47xx_private.h"
+
#include <linux/types.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
@@ -65,6 +67,12 @@ DEFINE_HWx_IRQDISPATCH(7)
void __init arch_init_irq(void)
{
+ /*
+ * This is the first arch callback after mm_init (we can use kmalloc),
+ * so let's finish bus initialization now.
+ */
+ bcm47xx_bus_setup();
+
#ifdef CONFIG_BCM47XX_BCMA
if (bcm47xx_bus_type == BCM47XX_BUS_TYPE_BCMA) {
bcma_write32(bcm47xx_bus.bcma.bus.drv_mips.core,