Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-14 00:47:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

cfi_flash: enable M18 flash chips family support.

Browse source 
Added new command set ID. Buffered write command processing is changed
in order to support M18 flash chips family.

Signed-off-by: Alexey Korolev <akorolev@infradead.org>
Signed-off-by: Vasiliy Leonenko <vasiliy.leonenko@mail.ru>
This commit is contained in:
Vasiliy Leoenenko 2008-05-07 21:25:33 +04:00 committed by Stefan Roese
parent 93c56f212c
commit 9c048b5234
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/mtd/cfi_flash.c
View file

@ -76,7 +76,9 @@
#define FLASH_CMD_PROTECT_SET 0x01 #define FLASH_CMD_PROTECT_SET 0x01
#define FLASH_CMD_PROTECT_CLEAR 0xD0 #define FLASH_CMD_PROTECT_CLEAR 0xD0
#define FLASH_CMD_CLEAR_STATUS 0x50 #define FLASH_CMD_CLEAR_STATUS 0x50
#define FLASH_CMD_READ_STATUS 0x70
#define FLASH_CMD_WRITE_TO_BUFFER 0xE8 #define FLASH_CMD_WRITE_TO_BUFFER 0xE8
#define FLASH_CMD_WRITE_BUFFER_PROG 0xE9
#define FLASH_CMD_WRITE_BUFFER_CONFIRM 0xD0 #define FLASH_CMD_WRITE_BUFFER_CONFIRM 0xD0
#define FLASH_STATUS_DONE 0x80 #define FLASH_STATUS_DONE 0x80
@ -136,6 +138,7 @@
#define CFI_CMDSET_MITSU_STANDARD 256 #define CFI_CMDSET_MITSU_STANDARD 256
#define CFI_CMDSET_MITSU_EXTENDED 257 #define CFI_CMDSET_MITSU_EXTENDED 257
#define CFI_CMDSET_SST 258 #define CFI_CMDSET_SST 258
#define CFI_CMDSET_INTEL_PROG_REGIONS 512
#ifdef CFG_FLASH_CFI_AMD_RESET /* needed for STM_ID_29W320DB on UC100 */ #ifdef CFG_FLASH_CFI_AMD_RESET /* needed for STM_ID_29W320DB on UC100 */
# undef FLASH_CMD_RESET # undef FLASH_CMD_RESET
@ -613,6 +616,7 @@ static int flash_is_busy (flash_info_t * info, flash_sect_t sect)
int retval; int retval;
switch (info->vendor) { switch (info->vendor) {
case CFI_CMDSET_INTEL_PROG_REGIONS:
case CFI_CMDSET_INTEL_STANDARD: case CFI_CMDSET_INTEL_STANDARD:
case CFI_CMDSET_INTEL_EXTENDED: case CFI_CMDSET_INTEL_EXTENDED:
retval = !flash_isset (info, sect, 0, FLASH_STATUS_DONE); retval = !flash_isset (info, sect, 0, FLASH_STATUS_DONE);
@ -672,6 +676,7 @@ static int flash_full_status_check (flash_info_t * info, flash_sect_t sector,
retcode = flash_status_check (info, sector, tout, prompt); retcode = flash_status_check (info, sector, tout, prompt);
switch (info->vendor) { switch (info->vendor) {
case CFI_CMDSET_INTEL_PROG_REGIONS:
case CFI_CMDSET_INTEL_EXTENDED: case CFI_CMDSET_INTEL_EXTENDED:
case CFI_CMDSET_INTEL_STANDARD: case CFI_CMDSET_INTEL_STANDARD:
if ((retcode == ERR_OK) if ((retcode == ERR_OK)
@ -800,6 +805,7 @@ static int flash_write_cfiword (flash_info_t * info, ulong dest,
flag = disable_interrupts (); flag = disable_interrupts ();
switch (info->vendor) { switch (info->vendor) {
case CFI_CMDSET_INTEL_PROG_REGIONS:
case CFI_CMDSET_INTEL_EXTENDED: case CFI_CMDSET_INTEL_EXTENDED:
case CFI_CMDSET_INTEL_STANDARD: case CFI_CMDSET_INTEL_STANDARD:
flash_write_cmd (info, 0, 0, FLASH_CMD_CLEAR_STATUS); flash_write_cmd (info, 0, 0, FLASH_CMD_CLEAR_STATUS);
@ -854,6 +860,7 @@ static int flash_write_cfibuffer (flash_info_t * info, ulong dest, uchar * cp,
int flag = 0; int flag = 0;
uint offset = 0; uint offset = 0;
unsigned int shift; unsigned int shift;
uchar write_cmd;
switch (info->portwidth) { switch (info->portwidth) {
case FLASH_CFI_8BIT: case FLASH_CFI_8BIT:
@ -908,10 +915,14 @@ static int flash_write_cfibuffer (flash_info_t * info, ulong dest, uchar * cp,
sector = find_sector (info, dest); sector = find_sector (info, dest);
switch (info->vendor) { switch (info->vendor) {
case CFI_CMDSET_INTEL_PROG_REGIONS:
case CFI_CMDSET_INTEL_STANDARD: case CFI_CMDSET_INTEL_STANDARD:
case CFI_CMDSET_INTEL_EXTENDED: case CFI_CMDSET_INTEL_EXTENDED:
write_cmd = (info->vendor == CFI_CMDSET_INTEL_PROG_REGIONS) ?
FLASH_CMD_WRITE_BUFFER_PROG : FLASH_CMD_WRITE_TO_BUFFER;
flash_write_cmd (info, sector, 0, FLASH_CMD_CLEAR_STATUS); flash_write_cmd (info, sector, 0, FLASH_CMD_CLEAR_STATUS);
flash_write_cmd (info, sector, 0, FLASH_CMD_WRITE_TO_BUFFER); flash_write_cmd (info, sector, 0, FLASH_CMD_READ_STATUS);
flash_write_cmd (info, sector, 0, write_cmd);
retcode = flash_status_check (info, sector, retcode = flash_status_check (info, sector,
info->buffer_write_tout, info->buffer_write_tout,
"write to buffer"); "write to buffer");
@ -961,7 +972,7 @@ static int flash_write_cfibuffer (flash_info_t * info, ulong dest, uchar * cp,
#endif #endif
flash_write_cmd(info, sector, offset, AMD_CMD_WRITE_TO_BUFFER); flash_write_cmd(info, sector, offset, AMD_CMD_WRITE_TO_BUFFER);
cnt = len >> shift; cnt = len >> shift;
flash_write_cmd(info, sector, offset, cnt - 1); flash_write_cmd(info, sector, offset, (uchar)cnt - 1);
switch (info->portwidth) { switch (info->portwidth) {
case FLASH_CFI_8BIT: case FLASH_CFI_8BIT:
@ -1046,6 +1057,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
for (sect = s_first; sect <= s_last; sect++) { for (sect = s_first; sect <= s_last; sect++) {
if (info->protect[sect] == 0) { /* not protected */ if (info->protect[sect] == 0) { /* not protected */
switch (info->vendor) { switch (info->vendor) {
case CFI_CMDSET_INTEL_PROG_REGIONS:
case CFI_CMDSET_INTEL_STANDARD: case CFI_CMDSET_INTEL_STANDARD:
case CFI_CMDSET_INTEL_EXTENDED: case CFI_CMDSET_INTEL_EXTENDED:
flash_write_cmd (info, sect, 0, flash_write_cmd (info, sect, 0,
@ -1114,6 +1126,9 @@ void flash_print_info (flash_info_t * info)
info->size >> 20, info->sector_count); info->size >> 20, info->sector_count);
printf (" "); printf (" ");
switch (info->vendor) { switch (info->vendor) {
case CFI_CMDSET_INTEL_PROG_REGIONS:
printf ("Intel Prog Regions");
break;
case CFI_CMDSET_INTEL_STANDARD: case CFI_CMDSET_INTEL_STANDARD:
printf ("Intel Standard"); printf ("Intel Standard");
break; break;
@ -1504,6 +1519,7 @@ static void flash_read_jedec_ids (flash_info_t * info)
info->device_id2 = 0; info->device_id2 = 0;
switch (info->vendor) { switch (info->vendor) {
case CFI_CMDSET_INTEL_PROG_REGIONS:
case CFI_CMDSET_INTEL_STANDARD: case CFI_CMDSET_INTEL_STANDARD:
case CFI_CMDSET_INTEL_EXTENDED: case CFI_CMDSET_INTEL_EXTENDED:
cmdset_intel_read_jedec_ids(info); cmdset_intel_read_jedec_ids(info);
@ -1558,6 +1574,7 @@ static int flash_detect_legacy(ulong base, int banknum)
} }
switch(info->vendor) { switch(info->vendor) {
case CFI_CMDSET_INTEL_PROG_REGIONS:
case CFI_CMDSET_INTEL_STANDARD: case CFI_CMDSET_INTEL_STANDARD:
case CFI_CMDSET_INTEL_EXTENDED: case CFI_CMDSET_INTEL_EXTENDED:
info->cmd_reset = FLASH_CMD_RESET; info->cmd_reset = FLASH_CMD_RESET;
@ -1753,6 +1770,7 @@ ulong flash_get_size (ulong base, int banknum)
#endif #endif
switch (info->vendor) { switch (info->vendor) {
case CFI_CMDSET_INTEL_PROG_REGIONS:
case CFI_CMDSET_INTEL_STANDARD: case CFI_CMDSET_INTEL_STANDARD:
case CFI_CMDSET_INTEL_EXTENDED: case CFI_CMDSET_INTEL_EXTENDED:
cmdset_intel_init(info, &qry); cmdset_intel_init(info, &qry);
@ -1830,6 +1848,7 @@ ulong flash_get_size (ulong base, int banknum)
* supported devices (intel...) * supported devices (intel...)
*/ */
switch (info->vendor) { switch (info->vendor) {
case CFI_CMDSET_INTEL_PROG_REGIONS:
case CFI_CMDSET_INTEL_EXTENDED: case CFI_CMDSET_INTEL_EXTENDED:
case CFI_CMDSET_INTEL_STANDARD: case CFI_CMDSET_INTEL_STANDARD:
info->protect[sect_cnt] = info->protect[sect_cnt] =