Merge branch 'master' of /home/stefan/git/u-boot/u-boot

[oweals/u-boot.git] / drivers / mtd / cfi_flash.c

diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 90cb966775d489841939aaa0c0ea8bc7f5f2a37a..c0ea97be70ec2316530d665bb9b76625e9c1cce8 100644 (file)
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -76,7 +76,9 @@
 #define FLASH_CMD_PROTECT_SET          0x01
 #define FLASH_CMD_PROTECT_CLEAR                0xD0
 #define FLASH_CMD_CLEAR_STATUS         0x50
+#define FLASH_CMD_READ_STATUS          0x70
 #define FLASH_CMD_WRITE_TO_BUFFER      0xE8
+#define FLASH_CMD_WRITE_BUFFER_PROG    0xE9
 #define FLASH_CMD_WRITE_BUFFER_CONFIRM 0xD0
 
 #define FLASH_STATUS_DONE              0x80
@@ -136,6 +138,7 @@
 #define CFI_CMDSET_MITSU_STANDARD      256
 #define CFI_CMDSET_MITSU_EXTENDED      257
 #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 */
 # undef  FLASH_CMD_RESET
@@ -578,20 +581,16 @@ static int flash_toggle (flash_info_t * info, flash_sect_t sect,
        flash_make_cmd (info, cmd, &cword);
        switch (info->portwidth) {
        case FLASH_CFI_8BIT:
-               retval = ((flash_read8(addr) & cword.c) !=
-                         (flash_read8(addr) & cword.c));
+               retval = flash_read8(addr) != flash_read8(addr);
                break;
        case FLASH_CFI_16BIT:
-               retval = ((flash_read16(addr) & cword.w) !=
-                         (flash_read16(addr) & cword.w));
+               retval = flash_read16(addr) != flash_read16(addr);
                break;
        case FLASH_CFI_32BIT:
-               retval = ((flash_read32(addr) & cword.l) !=
-                         (flash_read32(addr) & cword.l));
+               retval = flash_read32(addr) != flash_read32(addr);
                break;
        case FLASH_CFI_64BIT:
-               retval = ((flash_read64(addr) & cword.ll) !=
-                         (flash_read64(addr) & cword.ll));
+               retval = flash_read64(addr) != flash_read64(addr);
                break;
        default:
                retval = 0;
@@ -613,6 +612,7 @@ static int flash_is_busy (flash_info_t * info, flash_sect_t sect)
        int retval;
 
        switch (info->vendor) {
+       case CFI_CMDSET_INTEL_PROG_REGIONS:
        case CFI_CMDSET_INTEL_STANDARD:
        case CFI_CMDSET_INTEL_EXTENDED:
                retval = !flash_isset (info, sect, 0, FLASH_STATUS_DONE);
@@ -672,6 +672,7 @@ static int flash_full_status_check (flash_info_t * info, flash_sect_t sector,
 
        retcode = flash_status_check (info, sector, tout, prompt);
        switch (info->vendor) {
+       case CFI_CMDSET_INTEL_PROG_REGIONS:
        case CFI_CMDSET_INTEL_EXTENDED:
        case CFI_CMDSET_INTEL_STANDARD:
                if ((retcode == ERR_OK)
@@ -800,6 +801,7 @@ static int flash_write_cfiword (flash_info_t * info, ulong dest,
        flag = disable_interrupts ();
 
        switch (info->vendor) {
+       case CFI_CMDSET_INTEL_PROG_REGIONS:
        case CFI_CMDSET_INTEL_EXTENDED:
        case CFI_CMDSET_INTEL_STANDARD:
                flash_write_cmd (info, 0, 0, FLASH_CMD_CLEAR_STATUS);
@@ -854,6 +856,7 @@ static int flash_write_cfibuffer (flash_info_t * info, ulong dest, uchar * cp,
        int flag = 0;
        uint offset = 0;
        unsigned int shift;
+       uchar write_cmd;
 
        switch (info->portwidth) {
        case FLASH_CFI_8BIT:
@@ -908,10 +911,14 @@ static int flash_write_cfibuffer (flash_info_t * info, ulong dest, uchar * cp,
        sector = find_sector (info, dest);
 
        switch (info->vendor) {
+       case CFI_CMDSET_INTEL_PROG_REGIONS:
        case CFI_CMDSET_INTEL_STANDARD:
        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_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,
                                              info->buffer_write_tout,
                                              "write to buffer");
@@ -961,7 +968,7 @@ static int flash_write_cfibuffer (flash_info_t * info, ulong dest, uchar * cp,
 #endif
                flash_write_cmd(info, sector, offset, AMD_CMD_WRITE_TO_BUFFER);
                cnt = len >> shift;
-               flash_write_cmd(info, sector, offset, cnt - 1);
+               flash_write_cmd(info, sector, offset, (uchar)cnt - 1);
 
                switch (info->portwidth) {
                case FLASH_CFI_8BIT:
@@ -1046,6 +1053,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
        for (sect = s_first; sect <= s_last; sect++) {
                if (info->protect[sect] == 0) { /* not protected */
                        switch (info->vendor) {
+                       case CFI_CMDSET_INTEL_PROG_REGIONS:
                        case CFI_CMDSET_INTEL_STANDARD:
                        case CFI_CMDSET_INTEL_EXTENDED:
                                flash_write_cmd (info, sect, 0,
@@ -1114,6 +1122,9 @@ void flash_print_info (flash_info_t * info)
                        info->size >> 20, info->sector_count);
        printf ("  ");
        switch (info->vendor) {
+               case CFI_CMDSET_INTEL_PROG_REGIONS:
+                       printf ("Intel Prog Regions");
+                       break;
                case CFI_CMDSET_INTEL_STANDARD:
                        printf ("Intel Standard");
                        break;
@@ -1504,6 +1515,7 @@ static void flash_read_jedec_ids (flash_info_t * info)
        info->device_id2      = 0;
 
        switch (info->vendor) {
+       case CFI_CMDSET_INTEL_PROG_REGIONS:
        case CFI_CMDSET_INTEL_STANDARD:
        case CFI_CMDSET_INTEL_EXTENDED:
                cmdset_intel_read_jedec_ids(info);
@@ -1558,6 +1570,7 @@ static int flash_detect_legacy(ulong base, int banknum)
                }
 
                switch(info->vendor) {
+               case CFI_CMDSET_INTEL_PROG_REGIONS:
                case CFI_CMDSET_INTEL_STANDARD:
                case CFI_CMDSET_INTEL_EXTENDED:
                        info->cmd_reset = FLASH_CMD_RESET;
@@ -1728,6 +1741,8 @@ ulong flash_get_size (ulong base, int banknum)
        int erase_region_count;
        struct cfi_qry qry;
 
+       memset(&qry, 0, sizeof(qry));
+
        info->ext_addr = 0;
        info->cfi_version = 0;
 #ifdef CFG_FLASH_PROTECTION
@@ -1753,6 +1768,7 @@ ulong flash_get_size (ulong base, int banknum)
 #endif
 
                switch (info->vendor) {
+               case CFI_CMDSET_INTEL_PROG_REGIONS:
                case CFI_CMDSET_INTEL_STANDARD:
                case CFI_CMDSET_INTEL_EXTENDED:
                        cmdset_intel_init(info, &qry);
@@ -1830,6 +1846,7 @@ ulong flash_get_size (ulong base, int banknum)
                                 * supported devices (intel...)
                                 */
                                switch (info->vendor) {
+                               case CFI_CMDSET_INTEL_PROG_REGIONS:
                                case CFI_CMDSET_INTEL_EXTENDED:
                                case CFI_CMDSET_INTEL_STANDARD:
                                        info->protect[sect_cnt] =