sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

cfi_flash: update manufacturer id flash support 

several first banks can contain 0x7f instead of actual ID

support as done in linux

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2010-11-27 00:00:38 +08:00
parent ce35b3c09a
commit 8b41ca208e
4 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/nor/cfi_flash.c
View File

@ -269,6 +269,24 @@ static ulong flash_read_long (struct flash_info *info, flash_sect_t sect, uint o
* http://www.jedec.org/download/search/jesd68.pdf
*
*/
u32 jedec_read_mfr(struct flash_info *info)
{
int bank = 0;
uchar mfr;
/* According to JEDEC "Standard Manufacturer's Identification Code"
* (http://www.jedec.org/download/search/jep106W.pdf)
* several first banks can contain 0x7f instead of actual ID
*/
do {
mfr = flash_read_uchar (info,
(bank << 8) | FLASH_OFFSET_MANUFACTURER_ID);
bank++;
} while (mfr == FLASH_ID_CONTINUATION);
return mfr;
}
static int flash_detect_cfi (struct flash_info *info)
{
int cfi_offset;

3
drivers/nor/cfi_flash.h
View File

@ -107,6 +107,8 @@ extern struct cfi_cmd_set cfi_cmd_set_amd;
#define FLASH_STATUS_R 0x01
#define FLASH_STATUS_PROTECT 0x01
#define FLASH_ID_CONTINUATION 0x7F
#define AMD_CMD_RESET 0xF0
#define AMD_CMD_WRITE 0xA0
#define AMD_CMD_ERASE_START 0x80
@ -211,6 +213,7 @@ static inline uchar *flash_make_addr (struct flash_info *info, flash_sect_t sect
}
uchar flash_read_uchar (struct flash_info *info, uint offset);
u32 jedec_read_mfr(struct flash_info *info);
#ifdef CONFIG_DRIVER_CFI_BANK_WIDTH_1
#define bankwidth_is_1(info) (info->portwidth == 1)

4
drivers/nor/cfi_flash_amd.c
View File

@ -42,8 +42,8 @@ static void amd_read_jedec_ids (struct flash_info *info)
flash_unlock_seq(info);
flash_write_cmd(info, 0, info->addr_unlock1, FLASH_CMD_READ_ID);
udelay(1000); /* some flash are slow to respond */
info->manufacturer_id = flash_read_uchar (info,
FLASH_OFFSET_MANUFACTURER_ID);
info->manufacturer_id = jedec_read_mfr(info);
info->device_id = flash_read_uchar (info,
FLASH_OFFSET_DEVICE_ID);
if (info->device_id == 0x7E) {

4
drivers/nor/cfi_flash_intel.c
View File

@ -16,8 +16,8 @@ static void intel_read_jedec_ids (struct flash_info *info)
flash_write_cmd(info, 0, 0, FLASH_CMD_RESET);
flash_write_cmd(info, 0, 0, FLASH_CMD_READ_ID);
udelay(1000); /* some flash are slow to respond */
info->manufacturer_id = flash_read_uchar (info,
FLASH_OFFSET_MANUFACTURER_ID);
info->manufacturer_id = jedec_read_mfr(info);
info->device_id = flash_read_uchar (info,
FLASH_OFFSET_DEVICE_ID);
flash_write_cmd(info, 0, 0, FLASH_CMD_RESET);