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

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

bcma: move parallel flash support to separated file 



This follows the way of handling other flashes and cleans code a bit. As
next task we will want to move flash code to ChipCommon driver as:
1) Flash controllers are accesible using ChipCommon registers
2) This code isn't MIPS specific
This change prepares bcma for that.

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

drivers/bcma/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -70,6 +70,11 @@ config BCMA_DRIVER_MIPS 


	  If unsure, say N



config BCMA_PFLASH

	bool

	depends on BCMA_DRIVER_MIPS

	default y



config BCMA_SFLASH

	bool

	depends on BCMA_DRIVER_MIPS

drivers/bcma/Makefile

+1 −0
Original line number Diff line number Diff line 
bcma-y					+= main.o scan.o core.o sprom.o

bcma-y					+= driver_chipcommon.o driver_chipcommon_pmu.o

bcma-y					+= driver_chipcommon_b.o

bcma-$(CONFIG_BCMA_PFLASH)		+= driver_chipcommon_pflash.o

bcma-$(CONFIG_BCMA_SFLASH)		+= driver_chipcommon_sflash.o

bcma-$(CONFIG_BCMA_NFLASH)		+= driver_chipcommon_nflash.o

bcma-$(CONFIG_BCMA_DRIVER_PCI)		+= driver_pci.o

drivers/bcma/bcma_private.h

+15 −3
Original line number Diff line number Diff line
@@ -47,9 +47,6 @@ int bcma_sprom_get(struct bcma_bus *bus); 
void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc);

void bcma_core_chipcommon_init(struct bcma_drv_cc *cc);

void bcma_chipco_bcm4331_ext_pa_lines_ctl(struct bcma_drv_cc *cc, bool enable);

#ifdef CONFIG_BCMA_DRIVER_MIPS

extern struct platform_device bcma_pflash_dev;

#endif /* CONFIG_BCMA_DRIVER_MIPS */



/* driver_chipcommon_b.c */

int bcma_core_chipcommon_b_init(struct bcma_drv_cc_b *ccb);
@@ -61,6 +58,21 @@ void bcma_pmu_init(struct bcma_drv_cc *cc); 
u32 bcma_pmu_get_alp_clock(struct bcma_drv_cc *cc);

u32 bcma_pmu_get_cpu_clock(struct bcma_drv_cc *cc);



/**************************************************

 * driver_chipcommon_sflash.c

 **************************************************/



#ifdef CONFIG_BCMA_PFLASH

extern struct platform_device bcma_pflash_dev;

int bcma_pflash_init(struct bcma_drv_cc *cc);

#else

static inline int bcma_pflash_init(struct bcma_drv_cc *cc)

{

	bcma_err(cc->core->bus, "Parallel flash not supported\n");

	return 0;

}

#endif /* CONFIG_BCMA_PFLASH */



#ifdef CONFIG_BCMA_SFLASH

/* driver_chipcommon_sflash.c */

int bcma_sflash_init(struct bcma_drv_cc *cc);

drivers/bcma/driver_chipcommon_pflash.c

0 → 100644
+49 −0
Original line number Diff line number Diff line 
/*

 * Broadcom specific AMBA

 * ChipCommon parallel flash

 *

 * Licensed under the GNU/GPL. See COPYING for details.

 */



#include "bcma_private.h"



#include <linux/bcma/bcma.h>

#include <linux/mtd/physmap.h>

#include <linux/platform_device.h>



static const char * const part_probes[] = { "bcm47xxpart", NULL };



static struct physmap_flash_data bcma_pflash_data = {

	.part_probe_types	= part_probes,

};



static struct resource bcma_pflash_resource = {

	.name	= "bcma_pflash",

	.flags  = IORESOURCE_MEM,

};



struct platform_device bcma_pflash_dev = {

	.name		= "physmap-flash",

	.dev		= {

		.platform_data  = &bcma_pflash_data,

	},

	.resource	= &bcma_pflash_resource,

	.num_resources	= 1,

};



int bcma_pflash_init(struct bcma_drv_cc *cc)

{

	struct bcma_pflash *pflash = &cc->pflash;



	pflash->present = true;



	if (!(bcma_read32(cc->core, BCMA_CC_FLASH_CFG) & BCMA_CC_FLASH_CFG_DS))

		bcma_pflash_data.width = 1;

	else

		bcma_pflash_data.width = 2;



	bcma_pflash_resource.start = BCMA_SOC_FLASH2;

	bcma_pflash_resource.end = BCMA_SOC_FLASH2 + BCMA_SOC_FLASH2_SZ;



	return 0;

}

drivers/bcma/driver_mips.c

+1 −34
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 


#include <linux/bcma/bcma.h>



#include <linux/mtd/physmap.h>

#include <linux/platform_device.h>

#include <linux/serial.h>

#include <linux/serial_core.h>

#include <linux/serial_reg.h>
@@ -32,26 +30,6 @@ enum bcma_boot_dev { 
	BCMA_BOOT_DEV_NAND,

};



static const char * const part_probes[] = { "bcm47xxpart", NULL };



static struct physmap_flash_data bcma_pflash_data = {

	.part_probe_types	= part_probes,

};



static struct resource bcma_pflash_resource = {

	.name	= "bcma_pflash",

	.flags  = IORESOURCE_MEM,

};



struct platform_device bcma_pflash_dev = {

	.name		= "physmap-flash",

	.dev		= {

		.platform_data  = &bcma_pflash_data,

	},

	.resource	= &bcma_pflash_resource,

	.num_resources	= 1,

};



/* The 47162a0 hangs when reading MIPS DMP registers registers */

static inline bool bcma_core_mips_bcm47162a0_quirk(struct bcma_device *dev)

{
@@ -276,7 +254,6 @@ static void bcma_core_mips_flash_detect(struct bcma_drv_mips *mcore) 
{

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

	struct bcma_drv_cc *cc = &bus->drv_cc;

	struct bcma_pflash *pflash = &cc->pflash;

	enum bcma_boot_dev boot_dev;



	switch (cc->capabilities & BCMA_CC_CAP_FLASHT) {
@@ -287,17 +264,7 @@ static void bcma_core_mips_flash_detect(struct bcma_drv_mips *mcore) 
		break;

	case BCMA_CC_FLASHT_PARA:

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

		pflash->present = true;



		if ((bcma_read32(cc->core, BCMA_CC_FLASH_CFG) &

		     BCMA_CC_FLASH_CFG_DS) == 0)

			bcma_pflash_data.width = 1;

		else

			bcma_pflash_data.width = 2;



		bcma_pflash_resource.start = BCMA_SOC_FLASH2;

		bcma_pflash_resource.end = BCMA_SOC_FLASH2 + BCMA_SOC_FLASH2_SZ;



		bcma_pflash_init(cc);

		break;

	default:

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