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>

diff --git a/arch/blackfin/configs/BF609-EZKIT_defconfig b/arch/blackfin/configs/BF609-EZKIT_defconfig
index 07c92465109add799a04f684e4995ba5fea2cabb..0864f7aaa57299ee561e60b7b9c8895b9b174bdf 100644 (file)
--- 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 c8740f640c1155d93009c892c9e64daf9c927bdc..cf0175a1dec947a58993932f7a5f21a5fa5e8ef6 100644 (file)
--- 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)