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

Commit 1c400939 authored by Bob Liu's avatar Bob Liu
Browse files

blackfin:mach-bf609: fix norflash for bf609-ezkit 



Set smc register to async flash protocol mode and use physmap driver instead of
bfin-bf6xx.

Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
parent 6e1953e1

arch/blackfin/configs/BF609-EZKIT_defconfig

+2 −1
Original line number Original line Diff line number Diff line
@@ -57,11 +57,12 @@ CONFIG_FW_LOADER=m 
CONFIG_MTD=y

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_STAA=y

CONFIG_MTD_CFI_STAA=y

CONFIG_MTD_COMPLEX_MAPPINGS=y

CONFIG_MTD_COMPLEX_MAPPINGS=y

CONFIG_MTD_BFIN_BF60x=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_M25P80=y

CONFIG_MTD_M25P80=y

CONFIG_MTD_UBI=m

CONFIG_MTD_UBI=m

CONFIG_SCSI=y

CONFIG_SCSI=y

arch/blackfin/mach-bf609/boards/ezkit.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -642,7 +642,7 @@ static struct platform_device bfin_sdh_device = { 
};

};

#endif

#endif





#if defined(CONFIG_MTD_BFIN_BF60x) || defined(CONFIG_MTD_BFIN_BF60x_MODULE)

#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)

static struct mtd_partition ezkit_partitions[] = {

static struct mtd_partition ezkit_partitions[] = {

	{

	{

		.name       = "bootloader(nor)",

		.name       = "bootloader(nor)",
@@ -671,7 +671,7 @@ int bf609_nor_flash_init(struct platform_device *dev) 
	peripheral_request_list(pins, "smc0");

	peripheral_request_list(pins, "smc0");





	bfin_write32(SMC_GCTL, CONFIG_SMC_GCTL_VAL);

	bfin_write32(SMC_GCTL, CONFIG_SMC_GCTL_VAL);

	bfin_write32(SMC_B0CTL, 0x01002001);

	bfin_write32(SMC_B0CTL, 0x01002011);

	bfin_write32(SMC_B0TIM, 0x08170977);

	bfin_write32(SMC_B0TIM, 0x08170977);

	bfin_write32(SMC_B0ETIM, 0x00092231);

	bfin_write32(SMC_B0ETIM, 0x00092231);

	return 0;

	return 0;
@@ -691,7 +691,7 @@ static struct resource ezkit_flash_resource = { 
};

};





static struct platform_device ezkit_flash_device = {

static struct platform_device ezkit_flash_device = {

	.name          = "bf60x-flash",

	.name          = "physmap-flash",

	.id            = 0,

	.id            = 0,

	.dev = {

	.dev = {

		.platform_data = &ezkit_flash_data,

		.platform_data = &ezkit_flash_data,
@@ -1256,7 +1256,7 @@ static struct platform_device *ezkit_devices[] __initdata = { 
	&bfin_device_gpiokeys,

	&bfin_device_gpiokeys,

#endif

#endif





#if defined(CONFIG_MTD_BFIN_BF60x) || defined(CONFIG_MTD_BFIN_BF60x_MODULE)

#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)

	&ezkit_flash_device,

	&ezkit_flash_device,

#endif

#endif

#if defined(CONFIG_SND_BF6XX_I2S) || defined(CONFIG_SND_BF6XX_I2S_MODULE)

#if defined(CONFIG_SND_BF6XX_I2S) || defined(CONFIG_SND_BF6XX_I2S_MODULE)