sf: probe: Add support for M25P* flash parts

[u-boot] / drivers / mtd / spi / stmicro.c

diff --git a/drivers/mtd/spi/stmicro.c b/drivers/mtd/spi/stmicro.c
index 9ec938a46e2ffbf9f3d89678e20f2b0613a1febb..c5fa64e376cb235a075039eb4bb6f002c1b99d62 100644 (file)
--- a/drivers/mtd/spi/stmicro.c
+++ b/drivers/mtd/spi/stmicro.c
@@ -8,23 +8,7 @@
  * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
  * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -34,7 +18,7 @@
 #include "spi_flash_internal.h"
 
 /* M25Pxx-specific commands */
-#define CMD_M25PXX_RES         0xab    /* Release from DP, and Read Signature */
+#define CMD_M25PXX_RES 0xab    /* Release from DP, and Read Signature */
 
 struct stmicro_spi_flash_params {
        u16 id;
@@ -92,12 +76,30 @@ static const struct stmicro_spi_flash_params stmicro_spi_flash_table[] = {
                .nr_sectors = 64,
                .name = "M25P128",
        },
+       {
+               .id = 0xba16,
+               .pages_per_sector = 256,
+               .nr_sectors = 64,
+               .name = "N25Q32",
+       },
+       {
+               .id = 0xbb16,
+               .pages_per_sector = 256,
+               .nr_sectors = 64,
+               .name = "N25Q32A",
+       },
        {
                .id = 0xba17,
                .pages_per_sector = 256,
                .nr_sectors = 128,
                .name = "N25Q064",
        },
+       {
+               .id = 0xbb17,
+               .pages_per_sector = 256,
+               .nr_sectors = 128,
+               .name = "N25Q64A",
+       },
        {
                .id = 0xba18,
                .pages_per_sector = 256,
@@ -116,9 +118,39 @@ static const struct stmicro_spi_flash_params stmicro_spi_flash_table[] = {
                .nr_sectors = 512,
                .name = "N25Q256",
        },
+       {
+               .id = 0xbb19,
+               .pages_per_sector = 256,
+               .nr_sectors = 512,
+               .name = "N25Q256A",
+       },
+       {
+               .id = 0xba20,
+               .pages_per_sector = 256,
+               .nr_sectors = 1024,
+               .name = "N25Q512",
+       },
+       {
+               .id = 0xbb20,
+               .pages_per_sector = 256,
+               .nr_sectors = 1024,
+               .name = "N25Q512A",
+       },
+       {
+               .id = 0xba21,
+               .pages_per_sector = 256,
+               .nr_sectors = 2048,
+               .name = "N25Q1024",
+       },
+       {
+               .id = 0xbb21,
+               .pages_per_sector = 256,
+               .nr_sectors = 2048,
+               .name = "N25Q1024A",
+       },
 };
 
-struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 * idcode)
+struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 *idcode)
 {
        const struct stmicro_spi_flash_params *params;
        struct spi_flash *flash;
@@ -134,17 +166,17 @@ struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 * idcode)
                        idcode[0] = 0x20;
                        idcode[1] = 0x20;
                        idcode[2] = idcode[3] + 1;
-               } else
+               } else {
                        return NULL;
+               }
        }
 
        id = ((idcode[1] << 8) | idcode[2]);
 
        for (i = 0; i < ARRAY_SIZE(stmicro_spi_flash_table); i++) {
                params = &stmicro_spi_flash_table[i];
-               if (params->id == id) {
+               if (params->id == id)
                        break;
-               }
        }
 
        if (i == ARRAY_SIZE(stmicro_spi_flash_table)) {
@@ -152,21 +184,19 @@ struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 * idcode)
                return NULL;
        }
 
-       flash = malloc(sizeof(*flash));
+       flash = spi_flash_alloc_base(spi, params->name);
        if (!flash) {
                debug("SF: Failed to allocate memory\n");
                return NULL;
        }
 
-       flash->spi = spi;
-       flash->name = params->name;
-
-       flash->write = spi_flash_cmd_write_multi;
-       flash->erase = spi_flash_cmd_erase;
-       flash->read = spi_flash_cmd_read_fast;
        flash->page_size = 256;
        flash->sector_size = 256 * params->pages_per_sector;
        flash->size = flash->sector_size * params->nr_sectors;
 
+       /* for >= 512MiB flashes, use flag status instead of read_status */
+       if (flash->size >= 0x4000000)
+               flash->poll_cmd = CMD_FLAG_STATUS;
+
        return flash;
 }