Commit 0ea6f0c5 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Kalle Valo
Browse files

bcma: move flash detection code to ChipCommon core driver 



Flashes are attached and accessible through ChipCommon core, they aren't
connected to MIPS one. Moreover some new ARM devices (e.g. BCM47189) may
have serial flash accessibility using ChipCommon registers as well. To
support them we can't keep this code in MIPS core driver.

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent d6a3b51a

drivers/bcma/driver_chipcommon.c

+30 −0
Original line number Diff line number Diff line
@@ -115,6 +115,33 @@ int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc) 
	return 0;

}



static void bcma_core_chipcommon_flash_detect(struct bcma_drv_cc *cc)

{

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



	switch (cc->capabilities & BCMA_CC_CAP_FLASHT) {

	case BCMA_CC_FLASHT_STSER:

	case BCMA_CC_FLASHT_ATSER:

		bcma_debug(bus, "Found serial flash\n");

		bcma_sflash_init(cc);

		break;

	case BCMA_CC_FLASHT_PARA:

		bcma_debug(bus, "Found parallel flash\n");

		bcma_pflash_init(cc);

		break;

	default:

		bcma_err(bus, "Flash type not supported\n");

	}



	if (cc->core->id.rev == 38 ||

	    bus->chipinfo.id == BCMA_CHIP_ID_BCM4706) {

		if (cc->capabilities & BCMA_CC_CAP_NFLASH) {

			bcma_debug(bus, "Found NAND flash\n");

			bcma_nflash_init(cc);

		}

	}

}



void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc)

{

	struct bcma_bus *bus = cc->core->bus;
@@ -136,6 +163,9 @@ void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc) 
	if (IS_BUILTIN(CONFIG_BCM47XX) && bus->hosttype == BCMA_HOSTTYPE_SOC)

		bcma_chipco_serial_init(cc);



	if (bus->hosttype == BCMA_HOSTTYPE_SOC)

		bcma_core_chipcommon_flash_detect(cc);



	cc->early_setup_done = true;

}

drivers/bcma/driver_mips.c

+2 −25
Original line number Diff line number Diff line
@@ -250,34 +250,11 @@ static enum bcma_boot_dev bcma_boot_dev(struct bcma_bus *bus) 
	return BCMA_BOOT_DEV_SERIAL;

}



static void bcma_core_mips_flash_detect(struct bcma_drv_mips *mcore)

static void bcma_core_mips_nvram_init(struct bcma_drv_mips *mcore)

{

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

	struct bcma_drv_cc *cc = &bus->drv_cc;

	enum bcma_boot_dev boot_dev;



	switch (cc->capabilities & BCMA_CC_CAP_FLASHT) {

	case BCMA_CC_FLASHT_STSER:

	case BCMA_CC_FLASHT_ATSER:

		bcma_debug(bus, "Found serial flash\n");

		bcma_sflash_init(cc);

		break;

	case BCMA_CC_FLASHT_PARA:

		bcma_debug(bus, "Found parallel flash\n");

		bcma_pflash_init(cc);

		break;

	default:

		bcma_err(bus, "Flash type not supported\n");

	}



	if (cc->core->id.rev == 38 ||

	    bus->chipinfo.id == BCMA_CHIP_ID_BCM4706) {

		if (cc->capabilities & BCMA_CC_CAP_NFLASH) {

			bcma_debug(bus, "Found NAND flash\n");

			bcma_nflash_init(cc);

		}

	}



	/* Determine flash type this SoC boots from */

	boot_dev = bcma_boot_dev(bus);

	switch (boot_dev) {
@@ -304,7 +281,7 @@ void bcma_core_mips_early_init(struct bcma_drv_mips *mcore) 
	if (mcore->early_setup_done)

		return;



	bcma_core_mips_flash_detect(mcore);

	bcma_core_mips_nvram_init(mcore);



	mcore->early_setup_done = true;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE