diff options
| author | Bob Liu <lliubbo@gmail.com> | 2012-05-15 13:58:56 +0800 |
|---|---|---|
| committer | Bob Liu <lliubbo@gmail.com> | 2012-05-21 14:54:47 +0800 |
| commit | 1c40093976192c837c80f0c723394f176ca132ff (patch) | |
| tree | b12d8da67bed08d9cc095156c6aae7a8d495861a /arch | |
| parent | 6e1953e140e7c965cf18dd7dabfdfe853bb4786b (diff) | |
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: Bob Liu <lliubbo@gmail.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/blackfin/configs/BF609-EZKIT_defconfig | 3 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf609/boards/ezkit.c | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/arch/blackfin/configs/BF609-EZKIT_defconfig b/arch/blackfin/configs/BF609-EZKIT_defconfig index 07c92465109a..0864f7aaa572 100644 --- a/arch/blackfin/configs/BF609-EZKIT_defconfig +++ b/arch/blackfin/configs/BF609-EZKIT_defconfig @@ -57,11 +57,12 @@ CONFIG_FW_LOADER=m CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_CFI_STAA=y CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_BFIN_BF60x=y +CONFIG_MTD_PHYSMAP=y CONFIG_MTD_M25P80=y CONFIG_MTD_UBI=m CONFIG_SCSI=y diff --git a/arch/blackfin/mach-bf609/boards/ezkit.c b/arch/blackfin/mach-bf609/boards/ezkit.c index c8740f640c11..cf0175a1dec9 100644 --- a/arch/blackfin/mach-bf609/boards/ezkit.c +++ b/arch/blackfin/mach-bf609/boards/ezkit.c @@ -642,7 +642,7 @@ static struct platform_device bfin_sdh_device = { }; #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[] = { { .name = "bootloader(nor)", @@ -671,7 +671,7 @@ int bf609_nor_flash_init(struct platform_device *dev) peripheral_request_list(pins, "smc0"); 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_B0ETIM, 0x00092231); return 0; @@ -691,7 +691,7 @@ static struct resource ezkit_flash_resource = { }; static struct platform_device ezkit_flash_device = { - .name = "bf60x-flash", + .name = "physmap-flash", .id = 0, .dev = { .platform_data = &ezkit_flash_data, @@ -1256,7 +1256,7 @@ static struct platform_device *ezkit_devices[] __initdata = { &bfin_device_gpiokeys, #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, #endif #if defined(CONFIG_SND_BF6XX_I2S) || defined(CONFIG_SND_BF6XX_I2S_MODULE) |