From fbf9d876334ba5ef50704fe33543a48a9e6d0440 Mon Sep 17 00:00:00 2001 From: Oleksij Rempel Date: Wed, 22 May 2013 09:53:39 +0200 Subject: [PATCH] cfi_flash: add shift option for some cfi memory chips Many cfi chips support 16 and 8 bit modes. Most important difference is use of so called "Q15/A-1" pin. In 16bit mode this pin is used for data IO. In 8bit mode, it is an address input which add one more least significant bit (LSB). In this case we should shift all adresses by one: For example 0xaa << 1 = 0x154 Signed-off-by: Oleksij Rempel Signed-off-by: Sascha Hauer --- drivers/mtd/nor/cfi_flash.c | 23 +++++++++++++++++++---- drivers/mtd/nor/cfi_flash.h | 4 +++- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/nor/cfi_flash.c b/drivers/mtd/nor/cfi_flash.c index 0cfac2d03..4b4e29d4a 100644 --- a/drivers/mtd/nor/cfi_flash.c +++ b/drivers/mtd/nor/cfi_flash.c @@ -240,10 +240,10 @@ static void flash_read_cfi (struct flash_info *info, void *buf, p[i] = flash_read_uchar(info, start + i); } -static int flash_detect_cfi (struct flash_info *info, struct cfi_qry *qry) +static int flash_detect_width (struct flash_info *info, struct cfi_qry *qry) { int cfi_offset; - debug ("flash detect cfi\n"); + for (info->portwidth = CFG_FLASH_CFI_WIDTH; info->portwidth <= FLASH_CFI_64BIT; info->portwidth <<= 1) { @@ -264,8 +264,8 @@ static int flash_detect_cfi (struct flash_info *info, struct cfi_qry *qry) info->cfi_offset=flash_offset_cfi[cfi_offset]; debug ("device interface is %d\n", info->interface); - debug ("found port %d chip %d ", - info->portwidth, info->chipwidth); + debug ("found port %d chip %d chip_lsb %d ", + info->portwidth, info->chipwidth, info->chip_lsb); debug ("port %d bits chip %d bits\n", info->portwidth << CFI_FLASH_SHIFT_WIDTH, info->chipwidth << CFI_FLASH_SHIFT_WIDTH); @@ -278,6 +278,21 @@ static int flash_detect_cfi (struct flash_info *info, struct cfi_qry *qry) return 0; } +static int flash_detect_cfi (struct flash_info *info, struct cfi_qry *qry) +{ + int ret; + + debug ("flash detect cfi\n"); + + info->chip_lsb = 0; + ret = flash_detect_width (info, qry); + if (!ret) { + info->chip_lsb = 1; + ret = flash_detect_width (info, qry); + } + return ret; +} + /* * The following code cannot be run from FLASH! */ diff --git a/drivers/mtd/nor/cfi_flash.h b/drivers/mtd/nor/cfi_flash.h index bcf5c40c7..2a2454c86 100644 --- a/drivers/mtd/nor/cfi_flash.h +++ b/drivers/mtd/nor/cfi_flash.h @@ -57,6 +57,8 @@ struct flash_info { uchar portwidth; /* the width of the port */ uchar chipwidth; /* the width of the chip */ + uchar chip_lsb; /* extra Least Significant Bit in the */ + /* address of chip. */ ushort buffer_size; /* # of bytes in write buffer */ ulong erase_blk_tout; /* maximum block erase timeout */ ulong write_tout; /* maximum write timeout */ @@ -298,7 +300,7 @@ static inline u64 flash_read64(void *addr) */ static inline uchar *flash_make_addr (struct flash_info *info, flash_sect_t sect, uint offset) { - return ((uchar *) (info->start[sect] + (offset * info->portwidth))); + return ((uchar *) (info->start[sect] + ((offset * info->portwidth) << info->chip_lsb))); } uchar flash_read_uchar (struct flash_info *info, uint offset);