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

Commit e5810fa0 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Ralf Baechle
Browse files

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: default avatarRafał Miłecki <zajec5@gmail.com>
Acked-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/8234/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent a59da8fb

arch/mips/bcm47xx/bcm47xx_private.h

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ int __init bcm47xx_buttons_register(void); 
/* leds.c */

void __init bcm47xx_leds_register(void);



/* setup.c */

void __init bcm47xx_bus_setup(void);



/* workarounds.c */

void __init bcm47xx_workarounds(void);

arch/mips/bcm47xx/irq.c

+8 −0
Original line number Diff line number Diff line
@@ -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,

arch/mips/bcm47xx/setup.c

+27 −6
Original line number Diff line number Diff line
@@ -156,15 +156,14 @@ 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);

}

#endif



/*

 * Memory setup is done in the early part of MIPS's arch_mem_init. It's supposed

 * to detect memory and record it with add_memory_region.

 * Any extra initializaion performed here must not use kmalloc or bootmem.

 */

void __init plat_mem_setup(void)

{

	struct cpuinfo_mips *c = &current_cpu_data;
@@ -193,6 +192,28 @@ void __init plat_mem_setup(void) 
	_machine_restart = bcm47xx_machine_restart;

	_machine_halt = bcm47xx_machine_halt;

	pm_power_off = bcm47xx_machine_halt;

}



/*

 * This finishes bus initialization doing things that were not possible without

 * kmalloc. Make sure to call it late enough (after mm_init).

 */

void __init bcm47xx_bus_setup(void)

{

#ifdef CONFIG_BCM47XX_BCMA

	if (bcm47xx_bus_type == BCM47XX_BUS_TYPE_BCMA) {

		int 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);

	}

#endif



	/* With bus initialized we can access NVRAM and detect the board */

	bcm47xx_board_detect();

	mips_set_machine_name(bcm47xx_board_get_name());

}