Commit 49655bb8 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by John W. Linville
Browse files

bcma: just do the necessary things in early register on SoCs 



Some parts of the initialization for chip common and the pcie core are
accessing the sprom struct, but it is not initialized at that stage.
Just do the necessary thing in the early register on SoCs and not the
complete initialization to read out the nvram from the flash chip.
After it is possible to read out the nvram, the sprom should be parsed
from it and the full initialization of the cores should be run.

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b0a949b4

drivers/bcma/driver_chipcommon.c

+18 −5
Original line number Diff line number Diff line
@@ -22,12 +22,9 @@ static inline u32 bcma_cc_write32_masked(struct bcma_drv_cc *cc, u16 offset, 
	return value;

}



void bcma_core_chipcommon_init(struct bcma_drv_cc *cc)

void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc)

{

	u32 leddc_on = 10;

	u32 leddc_off = 90;



	if (cc->setup_done)

	if (cc->early_setup_done)

		return;



	if (cc->core->id.rev >= 11)
@@ -36,6 +33,22 @@ void bcma_core_chipcommon_init(struct bcma_drv_cc *cc) 
	if (cc->core->id.rev >= 35)

		cc->capabilities_ext = bcma_cc_read32(cc, BCMA_CC_CAP_EXT);



	if (cc->capabilities & BCMA_CC_CAP_PMU)

		bcma_pmu_early_init(cc);



	cc->early_setup_done = true;

}



void bcma_core_chipcommon_init(struct bcma_drv_cc *cc)

{

	u32 leddc_on = 10;

	u32 leddc_off = 90;



	if (cc->setup_done)

		return;



	bcma_core_chipcommon_early_init(cc);



	if (cc->core->id.rev >= 20) {

		bcma_cc_write32(cc, BCMA_CC_GPIOPULLUP, 0);

		bcma_cc_write32(cc, BCMA_CC_GPIOPULLDOWN, 0);

drivers/bcma/driver_chipcommon_pmu.c

+4 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static void bcma_pmu_workarounds(struct bcma_drv_cc *cc) 
	}

}



void bcma_pmu_init(struct bcma_drv_cc *cc)

void bcma_pmu_early_init(struct bcma_drv_cc *cc)

{

	u32 pmucap;
@@ -153,7 +153,10 @@ void bcma_pmu_init(struct bcma_drv_cc *cc) 


	bcma_debug(cc->core->bus, "Found rev %u PMU (capabilities 0x%08X)\n",

		   cc->pmu.rev, pmucap);

}



void bcma_pmu_init(struct bcma_drv_cc *cc)

{

	if (cc->pmu.rev == 1)

		bcma_cc_mask32(cc, BCMA_CC_PMU_CTL,

			      ~BCMA_CC_PMU_CTL_NOILPONW);

drivers/bcma/driver_mips.c

+19 −7
Original line number Diff line number Diff line
@@ -212,15 +212,32 @@ static void bcma_core_mips_flash_detect(struct bcma_drv_mips *mcore) 
	}

}



void bcma_core_mips_early_init(struct bcma_drv_mips *mcore)

{

	struct bcma_bus *bus = mcore->core->bus;



	if (mcore->early_setup_done)

		return;



	bcma_chipco_serial_init(&bus->drv_cc);

	bcma_core_mips_flash_detect(mcore);



	mcore->early_setup_done = true;

}



void bcma_core_mips_init(struct bcma_drv_mips *mcore)

{

	struct bcma_bus *bus;

	struct bcma_device *core;

	bus = mcore->core->bus;



	if (mcore->setup_done)

		return;



	bcma_info(bus, "Initializing MIPS core...\n");



	if (!mcore->setup_done)

	bcma_core_mips_early_init(mcore);



	mcore->assigned_irqs = 1;



	/* Assign IRQs to all cores on the bus */
@@ -256,10 +273,5 @@ void bcma_core_mips_init(struct bcma_drv_mips *mcore) 
	bcma_info(bus, "IRQ reconfiguration done\n");

	bcma_core_mips_dump_irq(bus);



	if (mcore->setup_done)

		return;



	bcma_chipco_serial_init(&bus->drv_cc);

	bcma_core_mips_flash_detect(mcore);

	mcore->setup_done = true;

}

drivers/bcma/main.c

+4 −4
Original line number Diff line number Diff line
@@ -274,18 +274,18 @@ int __init bcma_bus_early_register(struct bcma_bus *bus, 
		return -1;

	}



	/* Init CC core */

	/* Early init CC core */

	core = bcma_find_core(bus, bcma_cc_core_id(bus));

	if (core) {

		bus->drv_cc.core = core;

		bcma_core_chipcommon_init(&bus->drv_cc);

		bcma_core_chipcommon_early_init(&bus->drv_cc);

	}



	/* Init MIPS core */

	/* Early init MIPS core */

	core = bcma_find_core(bus, BCMA_CORE_MIPS_74K);

	if (core) {

		bus->drv_mips.core = core;

		bcma_core_mips_init(&bus->drv_mips);

		bcma_core_mips_early_init(&bus->drv_mips);

	}



	bcma_info(bus, "Early bus registered\n");

include/linux/bcma/bcma_driver_chipcommon.h

+3 −0
Original line number Diff line number Diff line
@@ -552,6 +552,7 @@ struct bcma_drv_cc { 
	u32 capabilities;

	u32 capabilities_ext;

	u8 setup_done:1;

	u8 early_setup_done:1;

	/* Fast Powerup Delay constant */

	u16 fast_pwrup_delay;

	struct bcma_chipcommon_pmu pmu;
@@ -583,6 +584,7 @@ struct bcma_drv_cc { 
	bcma_cc_write32(cc, offset, (bcma_cc_read32(cc, offset) & (mask)) | (set))



extern void bcma_core_chipcommon_init(struct bcma_drv_cc *cc);

extern void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc);



extern void bcma_chipco_suspend(struct bcma_drv_cc *cc);

extern void bcma_chipco_resume(struct bcma_drv_cc *cc);
@@ -606,6 +608,7 @@ u32 bcma_chipco_gpio_polarity(struct bcma_drv_cc *cc, u32 mask, u32 value); 


/* PMU support */

extern void bcma_pmu_init(struct bcma_drv_cc *cc);

extern void bcma_pmu_early_init(struct bcma_drv_cc *cc);



extern void bcma_chipco_pll_write(struct bcma_drv_cc *cc, u32 offset,

				  u32 value);

CRA Git | Maintained and supported by SUSTech CRA and CCSE