October 2013 - U-Boot

[U-Boot] [PATCH v5 18/32] sf: ramtron: Add support for separate flash driver
by Jagannadha Sutradharudu Teki 02 Oct '13

02 Oct '13

Compared to other spi flashes, ramtron has a different probing and implementation on flash ops, hence moved ramtron probe code into ramtron driver. Signed-off-by: Jagannadha Sutradharudu Teki <jaganna(a)xilinx.com> --- Changes for v5: - none Changes for v4: - none Changes for v3: - none Changes for v2: - none drivers/mtd/spi/Makefile | 5 +- drivers/mtd/spi/ramtron.c | 123 +++++++++++++- drivers/mtd/spi/spi_flash_probe.c | 4 - drivers/mtd/spi/spi_flash_probe_legacy.c | 276 ------------------------------- include/configs/top9000.h | 1 - 5 files changed, 125 insertions(+), 284 deletions(-) delete mode 100644 drivers/mtd/spi/spi_flash_probe_legacy.c diff --git a/drivers/mtd/spi/Makefile b/drivers/mtd/spi/Makefile index a10c850..2605e57 100644 --- a/drivers/mtd/spi/Makefile +++ b/drivers/mtd/spi/Makefile @@ -14,7 +14,10 @@ COBJS-$(CONFIG_SPL_SPI_LOAD) += spi_spl_load.o COBJS-$(CONFIG_SPL_SPI_BOOT) += fsl_espi_spl.o endif -COBJS-$(CONFIG_SPI_FLASH) += spi_flash_probe_legacy.o spi_flash_ops.o spi_flash.o +ifdef CONFIG_CMD_SF +COBJS-y += spi_flash.o +endif +COBJS-$(CONFIG_SPI_FLASH) += spi_flash_probe.o spi_flash_ops.o COBJS-$(CONFIG_SPI_FLASH_ATMEL) += atmel.o COBJS-$(CONFIG_SPI_FLASH_EON) += eon.o COBJS-$(CONFIG_SPI_FLASH_GIGADEVICE) += gigadevice.o diff --git a/drivers/mtd/spi/ramtron.c b/drivers/mtd/spi/ramtron.c index 38f9d69..c9701d0 100644 --- a/drivers/mtd/spi/ramtron.c +++ b/drivers/mtd/spi/ramtron.c @@ -214,7 +214,8 @@ static int ramtron_erase(struct spi_flash *flash, u32 offset, size_t len) * nore: we are called here with idcode pointing to the first non-0x7f byte * already! */ -struct spi_flash *spi_fram_probe_ramtron(struct spi_slave *spi, u8 *idcode) +static struct spi_flash *spi_fram_probe_ramtron(struct spi_slave *spi, + u8 *idcode) { const struct ramtron_spi_fram_params *params; struct ramtron_spi_fram *sn; @@ -270,7 +271,7 @@ struct spi_flash *spi_fram_probe_ramtron(struct spi_slave *spi, u8 *idcode) return NULL; found: - sn = spi_flash_alloc(struct ramtron_spi_fram, spi, params->name); + sn = malloc(sizeof(*sn)); if (!sn) { debug("SF: Failed to allocate memory\n"); return NULL; @@ -285,3 +286,121 @@ found: return &sn->flash; } + +/* + * The following table holds all device probe functions + * (All flashes are removed and implemented a common probe at + * spi_flash_probe.c) + * + * shift: number of continuation bytes before the ID + * idcode: the expected IDCODE or 0xff for non JEDEC devices + * probe: the function to call + * + * Non JEDEC devices should be ordered in the table such that + * the probe functions with best detection algorithms come first. + * + * Several matching entries are permitted, they will be tried + * in sequence until a probe function returns non NULL. + * + * IDCODE_CONT_LEN may be redefined if a device needs to declare a + * larger "shift" value. IDCODE_PART_LEN generally shouldn't be + * changed. This is the max number of bytes probe functions may + * examine when looking up part-specific identification info. + * + * Probe functions will be given the idcode buffer starting at their + * manu id byte (the "idcode" in the table below). In other words, + * all of the continuation bytes will be skipped (the "shift" below). + */ +#define IDCODE_CONT_LEN 0 +#define IDCODE_PART_LEN 5 +static const struct { + const u8 shift; + const u8 idcode; + struct spi_flash *(*probe) (struct spi_slave *spi, u8 *idcode); +} flashes[] = { + /* Keep it sorted by define name */ +#ifdef CONFIG_SPI_FRAM_RAMTRON + { 6, 0xc2, spi_fram_probe_ramtron, }, +# undef IDCODE_CONT_LEN +# define IDCODE_CONT_LEN 6 +#endif +#ifdef CONFIG_SPI_FRAM_RAMTRON_NON_JEDEC + { 0, 0xff, spi_fram_probe_ramtron, }, +#endif +}; +#define IDCODE_LEN (IDCODE_CONT_LEN + IDCODE_PART_LEN) + +struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, + unsigned int max_hz, unsigned int spi_mode) +{ + struct spi_slave *spi; + struct spi_flash *flash = NULL; + int ret, i, shift; + u8 idcode[IDCODE_LEN], *idp; + + spi = spi_setup_slave(bus, cs, max_hz, spi_mode); + if (!spi) { + printf("SF: Failed to set up slave\n"); + return NULL; + } + + ret = spi_claim_bus(spi); + if (ret) { + debug("SF: Failed to claim SPI bus: %d\n", ret); + goto err_claim_bus; + } + + /* Read the ID codes */ + ret = spi_flash_cmd(spi, CMD_READ_ID, idcode, sizeof(idcode)); + if (ret) + goto err_read_id; + +#ifdef DEBUG + printf("SF: Got idcodes\n"); + print_buffer(0, idcode, 1, sizeof(idcode), 0); +#endif + + /* count the number of continuation bytes */ + for (shift = 0, idp = idcode; + shift < IDCODE_CONT_LEN && *idp == 0x7f; + ++shift, ++idp) + continue; + + /* search the table for matches in shift and id */ + for (i = 0; i < ARRAY_SIZE(flashes); ++i) + if (flashes[i].shift == shift && flashes[i].idcode == *idp) { + /* we have a match, call probe */ + flash = flashes[i].probe(spi, idp); + if (flash) + break; + } + + if (!flash) { + printf("SF: Unsupported manufacturer %02x\n", *idp); + goto err_manufacturer_probe; + } + + printf("SF: Detected %s with page size ", flash->name); + print_size(flash->sector_size, ", total "); + print_size(flash->size, ""); + if (flash->memory_map) + printf(", mapped at %p", flash->memory_map); + puts("\n"); + + spi_release_bus(spi); + + return flash; + +err_manufacturer_probe: +err_read_id: + spi_release_bus(spi); +err_claim_bus: + spi_free_slave(spi); + return NULL; +} + +void spi_flash_free(struct spi_flash *flash) +{ + spi_free_slave(flash->spi); + free(flash); +} diff --git a/drivers/mtd/spi/spi_flash_probe.c b/drivers/mtd/spi/spi_flash_probe.c index cc30ad1..c432b04 100644 --- a/drivers/mtd/spi/spi_flash_probe.c +++ b/drivers/mtd/spi/spi_flash_probe.c @@ -144,10 +144,6 @@ static const struct spi_flash_params spi_flash_params_table[] = { * (W25Q64DW, W25Q64FV_QPI) * (W25Q128FW, W25Q128FV_QPI) */ - /* - * TODO: - * RAMTRON - */ }; struct spi_flash *spi_flash_validate_ids(struct spi_slave *spi, u8 *idcode) diff --git a/drivers/mtd/spi/spi_flash_probe_legacy.c b/drivers/mtd/spi/spi_flash_probe_legacy.c deleted file mode 100644 index 32ec578..0000000 --- a/drivers/mtd/spi/spi_flash_probe_legacy.c +++ /dev/null @@ -1,276 +0,0 @@ -/* - * SPI flash probing - * - * Copyright (C) 2008 Atmel Corporation - * Copyright (C) 2010 Reinhard Meyer, EMK Elektronik - * Copyright (C) 2013 Jagannadha Sutradharudu Teki, Xilinx Inc. - * - * Licensed under the GPL-2 or later. - */ - -#include <common.h> -#include <fdtdec.h> -#include <malloc.h> -#include <spi.h> -#include <spi_flash.h> - -#include "spi_flash_internal.h" - -DECLARE_GLOBAL_DATA_PTR; - -#ifdef CONFIG_SPI_FLASH_BAR -int spi_flash_bank_config(struct spi_flash *flash, u8 idcode0) -{ - u8 cmd; - u8 curr_bank = 0; - - /* discover bank cmds */ - switch (idcode0) { - case SPI_FLASH_SPANSION_IDCODE0: - flash->bank_read_cmd = CMD_BANKADDR_BRRD; - flash->bank_write_cmd = CMD_BANKADDR_BRWR; - break; - case SPI_FLASH_STMICRO_IDCODE0: - case SPI_FLASH_WINBOND_IDCODE0: - flash->bank_read_cmd = CMD_EXTNADDR_RDEAR; - flash->bank_write_cmd = CMD_EXTNADDR_WREAR; - break; - default: - printf("SF: Unsupported bank commands %02x\n", idcode0); - return -1; - } - - /* read the bank reg - on which bank the flash is in currently */ - cmd = flash->bank_read_cmd; - if (flash->size > SPI_FLASH_16MB_BOUN) { - if (spi_flash_read_common(flash, &cmd, 1, &curr_bank, 1)) { - debug("SF: fail to read bank addr register\n"); - return -1; - } - flash->bank_curr = curr_bank; - } else { - flash->bank_curr = curr_bank; - } - - return 0; -} -#endif - -#ifdef CONFIG_OF_CONTROL -int spi_flash_decode_fdt(const void *blob, struct spi_flash *flash) -{ - fdt_addr_t addr; - fdt_size_t size; - int node; - - /* If there is no node, do nothing */ - node = fdtdec_next_compatible(blob, 0, COMPAT_GENERIC_SPI_FLASH); - if (node < 0) - return 0; - - addr = fdtdec_get_addr_size(blob, node, "memory-map", &size); - if (addr == FDT_ADDR_T_NONE) { - debug("%s: Cannot decode address\n", __func__); - return 0; - } - - if (flash->size != size) { - debug("%s: Memory map must cover entire device\n", __func__); - return -1; - } - flash->memory_map = (void *)addr; - - return 0; -} -#endif /* CONFIG_OF_CONTROL */ - -/* - * The following table holds all device probe functions - * - * shift: number of continuation bytes before the ID - * idcode: the expected IDCODE or 0xff for non JEDEC devices - * probe: the function to call - * - * Non JEDEC devices should be ordered in the table such that - * the probe functions with best detection algorithms come first. - * - * Several matching entries are permitted, they will be tried - * in sequence until a probe function returns non NULL. - * - * IDCODE_CONT_LEN may be redefined if a device needs to declare a - * larger "shift" value. IDCODE_PART_LEN generally shouldn't be - * changed. This is the max number of bytes probe functions may - * examine when looking up part-specific identification info. - * - * Probe functions will be given the idcode buffer starting at their - * manu id byte (the "idcode" in the table below). In other words, - * all of the continuation bytes will be skipped (the "shift" below). - */ -#define IDCODE_CONT_LEN 0 -#define IDCODE_PART_LEN 5 -static const struct { - const u8 shift; - const u8 idcode; - struct spi_flash *(*probe) (struct spi_slave *spi, u8 *idcode); -} flashes[] = { - /* Keep it sorted by define name */ -#ifdef CONFIG_SPI_FLASH_ATMEL - { 0, 0x1f, spi_flash_probe_atmel, }, -#endif -#ifdef CONFIG_SPI_FLASH_EON - { 0, 0x1c, spi_flash_probe_eon, }, -#endif -#ifdef CONFIG_SPI_FLASH_GIGADEVICE - { 0, 0xc8, spi_flash_probe_gigadevice, }, -#endif -#ifdef CONFIG_SPI_FLASH_MACRONIX - { 0, 0xc2, spi_flash_probe_macronix, }, -#endif -#ifdef CONFIG_SPI_FLASH_SPANSION - { 0, 0x01, spi_flash_probe_spansion, }, -#endif -#ifdef CONFIG_SPI_FLASH_SST - { 0, 0xbf, spi_flash_probe_sst, }, -#endif -#ifdef CONFIG_SPI_FLASH_STMICRO - { 0, 0x20, spi_flash_probe_stmicro, }, -#endif -#ifdef CONFIG_SPI_FLASH_WINBOND - { 0, 0xef, spi_flash_probe_winbond, }, -#endif -#ifdef CONFIG_SPI_FRAM_RAMTRON - { 6, 0xc2, spi_fram_probe_ramtron, }, -# undef IDCODE_CONT_LEN -# define IDCODE_CONT_LEN 6 -#endif - /* Keep it sorted by best detection */ -#ifdef CONFIG_SPI_FLASH_STMICRO - { 0, 0xff, spi_flash_probe_stmicro, }, -#endif -#ifdef CONFIG_SPI_FRAM_RAMTRON_NON_JEDEC - { 0, 0xff, spi_fram_probe_ramtron, }, -#endif -}; -#define IDCODE_LEN (IDCODE_CONT_LEN + IDCODE_PART_LEN) - -struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, - unsigned int max_hz, unsigned int spi_mode) -{ - struct spi_slave *spi; - struct spi_flash *flash = NULL; - int ret, i, shift; - u8 idcode[IDCODE_LEN], *idp; - - spi = spi_setup_slave(bus, cs, max_hz, spi_mode); - if (!spi) { - printf("SF: Failed to set up slave\n"); - return NULL; - } - - ret = spi_claim_bus(spi); - if (ret) { - debug("SF: Failed to claim SPI bus: %d\n", ret); - goto err_claim_bus; - } - - /* Read the ID codes */ - ret = spi_flash_cmd(spi, CMD_READ_ID, idcode, sizeof(idcode)); - if (ret) - goto err_read_id; - -#ifdef DEBUG - printf("SF: Got idcodes\n"); - print_buffer(0, idcode, 1, sizeof(idcode), 0); -#endif - - /* count the number of continuation bytes */ - for (shift = 0, idp = idcode; - shift < IDCODE_CONT_LEN && *idp == 0x7f; - ++shift, ++idp) - continue; - - /* search the table for matches in shift and id */ - for (i = 0; i < ARRAY_SIZE(flashes); ++i) - if (flashes[i].shift == shift && flashes[i].idcode == *idp) { - /* we have a match, call probe */ - flash = flashes[i].probe(spi, idp); - if (flash) - break; - } - - if (!flash) { - printf("SF: Unsupported manufacturer %02x\n", *idp); - goto err_manufacturer_probe; - } - -#ifdef CONFIG_SPI_FLASH_BAR - /* Configure the BAR - disover bank cmds and read current bank */ - ret = spi_flash_bank_config(flash, *idp); - if (ret < 0) - goto err_manufacturer_probe; -#endif - -#ifdef CONFIG_OF_CONTROL - if (spi_flash_decode_fdt(gd->fdt_blob, flash)) { - debug("SF: FDT decode error\n"); - goto err_manufacturer_probe; - } -#endif -#ifndef CONFIG_SPL_BUILD - printf("SF: Detected %s with page size ", flash->name); - print_size(flash->sector_size, ", total "); - print_size(flash->size, ""); - if (flash->memory_map) - printf(", mapped at %p", flash->memory_map); - puts("\n"); -#endif -#ifndef CONFIG_SPI_FLASH_BAR - if (flash->size > SPI_FLASH_16MB_BOUN) { - puts("SF: Warning - Only lower 16MiB accessible,"); - puts(" Full access #define CONFIG_SPI_FLASH_BAR\n"); - } -#endif - - spi_release_bus(spi); - - return flash; - -err_manufacturer_probe: -err_read_id: - spi_release_bus(spi); -err_claim_bus: - spi_free_slave(spi); - return NULL; -} - -void *spi_flash_do_alloc(int offset, int size, struct spi_slave *spi, - const char *name) -{ - struct spi_flash *flash; - void *ptr; - - ptr = malloc(size); - if (!ptr) { - debug("SF: Failed to allocate memory\n"); - return NULL; - } - memset(ptr, '\0', size); - flash = (struct spi_flash *)(ptr + offset); - - /* Set up some basic fields - caller will sort out sizes */ - flash->spi = spi; - flash->name = name; - flash->poll_cmd = CMD_READ_STATUS; - - flash->read = spi_flash_cmd_read_fast; - flash->write = spi_flash_cmd_write_multi; - flash->erase = spi_flash_cmd_erase; - - return flash; -} - -void spi_flash_free(struct spi_flash *flash) -{ - spi_free_slave(flash->spi); - free(flash); -} diff --git a/include/configs/top9000.h b/include/configs/top9000.h index 65dabde..a6d6928 100644 --- a/include/configs/top9000.h +++ b/include/configs/top9000.h @@ -120,7 +120,6 @@ #define CONFIG_ATMEL_SPI0 /* SPI used for FRAM is SPI0 */ #define FRAM_SPI_BUS 0 #define FRAM_CS_NUM 0 -#define CONFIG_SPI_FLASH /* RAMTRON FRAM on SPI bus */ #define CONFIG_SPI_FRAM_RAMTRON #define CONFIG_SF_DEFAULT_SPEED 1000000 /* be conservative here... */ #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -- 1.8.3

1 0

[U-Boot] [PATCH v5 17/32] sf: Add proper comment style on spi_flash structure
by Jagannadha Sutradharudu Teki 02 Oct '13

02 Oct '13

Added proper comment style on spi_flash structure to make more readable. Signed-off-by: Jagannadha Sutradharudu Teki <jaganna(a)xilinx.com> --- Changes for v5: - Added comments on func Changes for v4: - none Changes for v3: - none Changes for v2: - none include/spi_flash.h | 67 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 28 deletions(-) diff --git a/include/spi_flash.h b/include/spi_flash.h index 09af55d..7ffc7b2 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -29,39 +29,50 @@ # define CMD_SST_AAI_WP 0xAD /* Auto Address Incr Word Program */ #endif +/** + * struct spi_flash - SPI flash structure + * + * @spi: SPI slave + * @name: Name of SPI flash + * @size: Total flash size + * @page_size: Write (page) size + * @sector_size: Sector size + * @erase_size: Erase size + * @bank_read_cmd: Bank read cmd + * @bank_write_cmd: Bank write cmd + * @bank_curr: Current flash bank + * @poll_cmd: Poll cmd - for flash erase/program + * @erase_cmd: Erase cmd 4K, 32K, 64K + * @memory_map: Address of read-only SPI flash access + * @read: Flash read ops: Read len bytes at offset into buf + * Supported cmds: Fast Array Read + * @write: Flash write ops: Write len bytes from buf into offeset + * Supported cmds: Page Program + * @erase: Flash erase ops: Erase len bytes from offset + * Supported cmds: Sector erase 4K, 32K, 64K + * return 0 - Sucess, 1 - Failure + */ struct spi_flash { struct spi_slave *spi; + const char *name; - const char *name; - - /* Total flash size */ - u32 size; - /* Write (page) size */ - u32 page_size; - /* Sector size */ - u32 sector_size; - /* Erase size */ - u32 erase_size; + u32 size; + u32 page_size; + u32 sector_size; + u32 erase_size; #ifdef CONFIG_SPI_FLASH_BAR - /* Bank read cmd */ - u8 bank_read_cmd; - /* Bank write cmd */ - u8 bank_write_cmd; - /* Current flash bank */ - u8 bank_curr; + u8 bank_read_cmd; + u8 bank_write_cmd; + u8 bank_curr; #endif - /* Poll cmd - for flash erase/program */ - u8 poll_cmd; - /* Erase cmd 4K, 32K, 64K */ - u8 erase_cmd; - - void *memory_map; /* Address of read-only SPI flash access */ - int (*read)(struct spi_flash *flash, u32 offset, - size_t len, void *buf); - int (*write)(struct spi_flash *flash, u32 offset, - size_t len, const void *buf); - int (*erase)(struct spi_flash *flash, u32 offset, - size_t len); + u8 poll_cmd; + u8 erase_cmd; + + void *memory_map; + int (*read)(struct spi_flash *flash, u32 offset, size_t len, void *buf); + int (*write)(struct spi_flash *flash, u32 offset, size_t len, + const void *buf); + int (*erase)(struct spi_flash *flash, u32 offset, size_t len); }; /** -- 1.8.3

1 0

[U-Boot] [PATCH v5 16/32] sf: probe: Simply the BAR configuration logic
by Jagannadha Sutradharudu Teki 02 Oct '13

02 Oct '13

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna(a)xilinx.com> --- Changes for v5: - more simplification. Changes for v4: - none Changes for v3: - none Changes for v2: - none drivers/mtd/spi/spi_flash_internal.h | 8 ----- drivers/mtd/spi/spi_flash_probe.c | 66 +++++++++++------------------------- 2 files changed, 20 insertions(+), 54 deletions(-) diff --git a/drivers/mtd/spi/spi_flash_internal.h b/drivers/mtd/spi/spi_flash_internal.h index ce34ce0..61de237 100644 --- a/drivers/mtd/spi/spi_flash_internal.h +++ b/drivers/mtd/spi/spi_flash_internal.h @@ -31,11 +31,6 @@ #define SPI_FLASH_16MB_BOUN 0x1000000 -/* Manufacture ID's */ -#define SPI_FLASH_SPANSION_IDCODE0 0x01 -#define SPI_FLASH_STMICRO_IDCODE0 0x20 -#define SPI_FLASH_WINBOND_IDCODE0 0xef - #ifdef CONFIG_SPI_FLASH_BAR /* Bank addr access commands */ # define CMD_BANKADDR_BRWR 0x17 @@ -102,9 +97,6 @@ int spi_flash_cmd_write_status(struct spi_flash *flash, u8 sr); #ifdef CONFIG_SPI_FLASH_BAR /* Program the bank address register */ int spi_flash_cmd_bankaddr_write(struct spi_flash *flash, u8 bank_sel); - -/* Configure the BAR - discover the bank cmds */ -int spi_flash_bank_config(struct spi_flash *flash, u8 idcode0); #endif /* diff --git a/drivers/mtd/spi/spi_flash_probe.c b/drivers/mtd/spi/spi_flash_probe.c index 8ea6915..cc30ad1 100644 --- a/drivers/mtd/spi/spi_flash_probe.c +++ b/drivers/mtd/spi/spi_flash_probe.c @@ -221,54 +221,36 @@ struct spi_flash *spi_flash_validate_ids(struct spi_slave *spi, u8 *idcode) flash->poll_cmd = CMD_FLAG_STATUS; #endif - /* Flash powers up read-only, so clear BP# bits */ -#if defined(CONFIG_SPI_FLASH_ATMEL) || \ - defined(CONFIG_SPI_FLASH_MACRONIX) || \ - defined(CONFIG_SPI_FLASH_SST) - spi_flash_cmd_write_status(flash, 0); -#endif - - return flash; -} - #ifdef CONFIG_SPI_FLASH_BAR -int spi_flash_bank_config(struct spi_flash *flash, u8 idcode0) -{ - u8 cmd; + /* Configure the BAR - discover bank cmds and read current bank */ u8 curr_bank = 0; - - /* discover bank cmds */ - switch (idcode0) { - case SPI_FLASH_SPANSION_IDCODE0: - flash->bank_read_cmd = CMD_BANKADDR_BRRD; - flash->bank_write_cmd = CMD_BANKADDR_BRWR; - break; - case SPI_FLASH_STMICRO_IDCODE0: - case SPI_FLASH_WINBOND_IDCODE0: - flash->bank_read_cmd = CMD_EXTNADDR_RDEAR; - flash->bank_write_cmd = CMD_EXTNADDR_WREAR; - break; - default: - printf("SF: Unsupported bank commands %02x\n", idcode0); - return -1; - } - - /* read the bank reg - on which bank the flash is in currently */ - cmd = flash->bank_read_cmd; if (flash->size > SPI_FLASH_16MB_BOUN) { - if (spi_flash_read_common(flash, &cmd, 1, &curr_bank, 1)) { + flash->bank_read_cmd = (idcode[0] == 0x01) ? + CMD_BANKADDR_BRRD : CMD_EXTNADDR_RDEAR; + flash->bank_write_cmd = (idcode[0] == 0x01) ? + CMD_BANKADDR_BRWR : CMD_EXTNADDR_WREAR; + + if (spi_flash_read_common(flash, &flash->bank_read_cmd, 1, + &curr_bank, 1)) { debug("SF: fail to read bank addr register\n"); - return -1; + return NULL; } flash->bank_curr = curr_bank; } else { flash->bank_curr = curr_bank; } +#endif - return 0; -} + /* Flash powers up read-only, so clear BP# bits */ +#if defined(CONFIG_SPI_FLASH_ATMEL) || \ + defined(CONFIG_SPI_FLASH_MACRONIX) || \ + defined(CONFIG_SPI_FLASH_SST) + spi_flash_cmd_write_status(flash, 0); #endif + return flash; +} + #ifdef CONFIG_OF_CONTROL int spi_flash_decode_fdt(const void *blob, struct spi_flash *flash) { @@ -302,7 +284,7 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, { struct spi_slave *spi; struct spi_flash *flash = NULL; - u8 idcode[5], *idp; + u8 idcode[5]; int ret; /* Setup spi_slave */ @@ -332,18 +314,10 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, #endif /* Validate ID's from flash dev table */ - idp = idcode; - flash = spi_flash_validate_ids(spi, idp); + flash = spi_flash_validate_ids(spi, idcode); if (!flash) goto err_read_id; -#ifdef CONFIG_SPI_FLASH_BAR - /* Configure the BAR - discover bank cmds and read current bank */ - ret = spi_flash_bank_config(flash, *idp); - if (ret < 0) - goto err_read_id; -#endif - #ifdef CONFIG_OF_CONTROL if (spi_flash_decode_fdt(gd->fdt_blob, flash)) { debug("SF: FDT decode error\n"); -- 1.8.3

1 0

[U-Boot] [PATCH v5 15/32] sf: probe: Add support for flag status polling
by Jagannadha Sutradharudu Teki 02 Oct '13

02 Oct '13

>From Micron, 512MB onwards, flash requires to poll flag status instead of read status- hence added E_FSR flag on spectific flash parts. Signed-off-by: Jagannadha Sutradharudu Teki <jaganna(a)xilinx.com> --- Changes for v5: - none Changes for v4: - none Changes for v3: - none Changes for v2: - none drivers/mtd/spi/spi_flash_probe.c | 16 +++++++++++----- include/spi_flash.h | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/spi/spi_flash_probe.c b/drivers/mtd/spi/spi_flash_probe.c index 9c2e115..8ea6915 100644 --- a/drivers/mtd/spi/spi_flash_probe.c +++ b/drivers/mtd/spi/spi_flash_probe.c @@ -94,10 +94,10 @@ static const struct spi_flash_params spi_flash_params_table[] = { {"N25Q128A", 0x20bb18, 0x0, 64 * 1024, 256, SECT_4K}, {"N25Q256", 0x20ba19, 0x0, 64 * 1024, 512, SECT_4K}, {"N25Q256A", 0x20bb19, 0x0, 64 * 1024, 512, SECT_4K}, - {"N25Q512", 0x20ba20, 0x0, 64 * 1024, 1024, SECT_4K}, - {"N25Q512A", 0x20bb20, 0x0, 64 * 1024, 1024, SECT_4K}, - {"N25Q1024", 0x20ba21, 0x0, 64 * 1024, 2048, SECT_4K}, - {"N25Q1024A", 0x20bb21, 0x0, 64 * 1024, 2048, SECT_4K}, + {"N25Q512", 0x20ba20, 0x0, 64 * 1024, 1024, E_FSR | SECT_4K}, + {"N25Q512A", 0x20bb20, 0x0, 64 * 1024, 1024, E_FSR | SECT_4K}, + {"N25Q1024", 0x20ba21, 0x0, 64 * 1024, 2048, E_FSR | SECT_4K}, + {"N25Q1024A", 0x20bb21, 0x0, 64 * 1024, 2048, E_FSR | SECT_4K}, #endif #ifdef CONFIG_SPI_FLASH_SST /* SST */ {"SST25VF040B", 0xbf258d, 0x0, 64 * 1024, 8, SECT_4K | SST_WP}, @@ -187,7 +187,6 @@ struct spi_flash *spi_flash_validate_ids(struct spi_slave *spi, u8 *idcode) flash->spi = spi; flash->name = params->name; - flash->poll_cmd = CMD_READ_STATUS; /* Assign spi_flash ops */ flash->write = spi_flash_cmd_write_multi; @@ -215,6 +214,13 @@ struct spi_flash *spi_flash_validate_ids(struct spi_slave *spi, u8 *idcode) flash->erase_size = flash->sector_size; } + /* Poll cmd seclection */ + flash->poll_cmd = CMD_READ_STATUS; +#ifdef CONFIG_SPI_FLASH_STMICRO + if (params->flags & E_FSR) + flash->poll_cmd = CMD_FLAG_STATUS; +#endif + /* Flash powers up read-only, so clear BP# bits */ #if defined(CONFIG_SPI_FLASH_ATMEL) || \ defined(CONFIG_SPI_FLASH_MACRONIX) || \ diff --git a/include/spi_flash.h b/include/spi_flash.h index 0d40e6c..09af55d 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -20,6 +20,7 @@ /* SECT flags */ #define SECT_4K (1 << 1) #define SECT_32K (1 << 2) +#define E_FSR (1 << 3) /* SST specific macros */ #ifdef CONFIG_SPI_FLASH_SST -- 1.8.3

1 0

[U-Boot] [PATCH v5 14/32] sf: probe: Add support for erase sector selection flag
by Jagannadha Sutradharudu Teki 02 Oct '13

02 Oct '13

SECT_4K, SECT_32K and SECT_64K opeartions are performed to to specific flash by adding a SECT* flag on respective spi_flash_params.flag param. Signed-off-by: Jagannadha Sutradharudu Teki <jaganna(a)xilinx.com> --- Changes for v5: - Update the sector flag for winbond Changes for v4: - none Changes for v3: - none Changes for v2: - none drivers/mtd/spi/spi_flash_ops.c | 8 +- drivers/mtd/spi/spi_flash_probe.c | 166 ++++++++++++++++++++------------------ include/spi_flash.h | 10 ++- 3 files changed, 100 insertions(+), 84 deletions(-) diff --git a/drivers/mtd/spi/spi_flash_ops.c b/drivers/mtd/spi/spi_flash_ops.c index 79381b1..c408e27 100644 --- a/drivers/mtd/spi/spi_flash_ops.c +++ b/drivers/mtd/spi/spi_flash_ops.c @@ -153,17 +153,13 @@ int spi_flash_cmd_erase(struct spi_flash *flash, u32 offset, size_t len) u8 cmd[4]; int ret = -1; - erase_size = flash->sector_size; + erase_size = flash->erase_size; if (offset % erase_size || len % erase_size) { debug("SF: Erase offset/length not multiple of erase size\n"); return -1; } - if (erase_size == 4096) - cmd[0] = CMD_ERASE_4K; - else - cmd[0] = CMD_ERASE_64K; - + cmd[0] = flash->erase_cmd; while (len) { #ifdef CONFIG_SPI_FLASH_BAR u8 bank_sel; diff --git a/drivers/mtd/spi/spi_flash_probe.c b/drivers/mtd/spi/spi_flash_probe.c index 4659134..9c2e115 100644 --- a/drivers/mtd/spi/spi_flash_probe.c +++ b/drivers/mtd/spi/spi_flash_probe.c @@ -39,97 +39,97 @@ struct spi_flash_params { static const struct spi_flash_params spi_flash_params_table[] = { #ifdef CONFIG_SPI_FLASH_ATMEL /* ATMEL */ - {"AT45DB011D", 0x1f2200, 0x0, 64 * 1024, 4, 0}, - {"AT45DB021D", 0x1f2300, 0x0, 64 * 1024, 8, 0}, - {"AT45DB041D", 0x1f2400, 0x0, 64 * 1024, 8, 0}, - {"AT45DB081D", 0x1f2500, 0x0, 64 * 1024, 16, 0}, - {"AT45DB161D", 0x1f2600, 0x0, 64 * 1024, 32, 0}, - {"AT45DB321D", 0x1f2700, 0x0, 64 * 1024, 64, 0}, - {"AT45DB641D", 0x1f2800, 0x0, 64 * 1024, 128, 0}, + {"AT45DB011D", 0x1f2200, 0x0, 64 * 1024, 4, SECT_4K}, + {"AT45DB021D", 0x1f2300, 0x0, 64 * 1024, 8, SECT_4K}, + {"AT45DB041D", 0x1f2400, 0x0, 64 * 1024, 8, SECT_4K}, + {"AT45DB081D", 0x1f2500, 0x0, 64 * 1024, 16, SECT_4K}, + {"AT45DB161D", 0x1f2600, 0x0, 64 * 1024, 32, SECT_4K}, + {"AT45DB321D", 0x1f2700, 0x0, 64 * 1024, 64, SECT_4K}, + {"AT45DB641D", 0x1f2800, 0x0, 64 * 1024, 128, SECT_4K}, #endif #ifdef CONFIG_SPI_FLASH_EON /* EON */ - {"EN25Q32B", 0x1c3016, 0x0, 64 * 1024, 64, 0}, - {"EN25Q128B", 0x1c3018, 0x0, 64 * 1024, 256, 0}, + {"EN25Q32B", 0x1c3016, 0x0, 64 * 1024, 64, 0}, + {"EN25Q128B", 0x1c3018, 0x0, 64 * 1024, 256, 0}, #endif #ifdef CONFIG_SPI_FLASH_GIGADEVICE /* GIGADEVICE */ - {"GD25Q64B", 0xc84017, 0x0, 64 * 1024, 128, 0}, - {"GD25LQ32", 0xc86016, 0x0, 64 * 1024, 64, 0}, + {"GD25Q64B", 0xc84017, 0x0, 64 * 1024, 128, SECT_4K}, + {"GD25LQ32", 0xc86016, 0x0, 64 * 1024, 64, SECT_4K}, #endif #ifdef CONFIG_SPI_FLASH_MACRONIX /* MACRONIX */ - {"MX25L4005", 0xc22013, 0x0, 64 * 1024, 8, 0}, - {"MX25L8005", 0xc22014, 0x0, 64 * 1024, 16, 0}, - {"MX25L1605D", 0xc22015, 0x0, 64 * 1024, 32, 0}, - {"MX25L3205D", 0xc22016, 0x0, 64 * 1024, 64, 0}, - {"MX25L6405D", 0xc22017, 0x0, 64 * 1024, 128, 0}, - {"MX25L12805", 0xc22018, 0x0, 64 * 1024, 256, 0}, - {"MX25L12855E", 0xc22618, 0x0, 64 * 1024, 256, 0}, + {"MX25L4005", 0xc22013, 0x0, 64 * 1024, 8, 0}, + {"MX25L8005", 0xc22014, 0x0, 64 * 1024, 16, 0}, + {"MX25L1605D", 0xc22015, 0x0, 64 * 1024, 32, 0}, + {"MX25L3205D", 0xc22016, 0x0, 64 * 1024, 64, 0}, + {"MX25L6405D", 0xc22017, 0x0, 64 * 1024, 128, 0}, + {"MX25L12805", 0xc22018, 0x0, 64 * 1024, 256, 0}, + {"MX25L12855E", 0xc22618, 0x0, 64 * 1024, 256, 0}, #endif #ifdef CONFIG_SPI_FLASH_SPANSION /* SPANSION */ - {"S25FL008A", 0x010213, 0x0, 64 * 1024, 16, 0}, - {"S25FL016A", 0x010214, 0x0, 64 * 1024, 32, 0}, - {"S25FL032A", 0x010215, 0x0, 64 * 1024, 64, 0}, - {"S25FL064A", 0x010216, 0x0, 64 * 1024, 128, 0}, - {"S25FL128P_256K", 0x012018, 0x0300, 256 * 1024, 64, 0}, - {"S25FL128P_64K", 0x012018, 0x0301, 64 * 1024, 256, 0}, - {"S25FL032P", 0x010215, 0x4d00, 64 * 1024, 64, 0}, - {"S25FL064P", 0x010216, 0x4d00, 64 * 1024, 128, 0}, - {"S25FL128S_64K", 0x012018, 0x4d01, 64 * 1024, 256, 0}, - {"S25FL256S_64K", 0x010219, 0x4d01, 64 * 1024, 512, 0}, - {"S25FL512S_64K", 0x010220, 0x4d01, 64 * 1024, 1024, 0}, + {"S25FL008A", 0x010213, 0x0, 64 * 1024, 16, 0}, + {"S25FL016A", 0x010214, 0x0, 64 * 1024, 32, 0}, + {"S25FL032A", 0x010215, 0x0, 64 * 1024, 64, 0}, + {"S25FL064A", 0x010216, 0x0, 64 * 1024, 128, 0}, + {"S25FL128P_256K", 0x012018, 0x0300, 256 * 1024, 64, 0}, + {"S25FL128P_64K", 0x012018, 0x0301, 64 * 1024, 256, 0}, + {"S25FL032P", 0x010215, 0x4d00, 64 * 1024, 64, 0}, + {"S25FL064P", 0x010216, 0x4d00, 64 * 1024, 128, 0}, + {"S25FL128S_64K", 0x012018, 0x4d01, 64 * 1024, 256, 0}, + {"S25FL256S_64K", 0x010219, 0x4d01, 64 * 1024, 512, 0}, + {"S25FL512S_64K", 0x010220, 0x4d01, 64 * 1024, 1024, 0}, #endif #ifdef CONFIG_SPI_FLASH_STMICRO /* STMICRO */ - {"M25P10", 0x202011, 0x0, 32 * 1024, 4, 0}, - {"M25P20", 0x202012, 0x0, 64 * 1024, 4, 0}, - {"M25P40", 0x202013, 0x0, 64 * 1024, 8, 0}, - {"M25P80", 0x202014, 0x0, 64 * 1024, 16, 0}, - {"M25P16", 0x202015, 0x0, 64 * 1024, 32, 0}, - {"M25P32", 0x202016, 0x0, 64 * 1024, 64, 0}, - {"M25P64", 0x202017, 0x0, 64 * 1024, 128, 0}, - {"M25P128", 0x202018, 0x0, 256 * 1024, 64, 0}, - {"N25Q32", 0x20ba16, 0x0, 64 * 1024, 64, 0}, - {"N25Q32A", 0x20bb16, 0x0, 64 * 1024, 64, 0}, - {"N25Q64", 0x20ba17, 0x0, 64 * 1024, 128, 0}, - {"N25Q64A", 0x20bb17, 0x0, 64 * 1024, 128, 0}, - {"N25Q128", 0x20ba18, 0x0, 64 * 1024, 256, 0}, - {"N25Q128A", 0x20bb18, 0x0, 64 * 1024, 256, 0}, - {"N25Q256", 0x20ba19, 0x0, 64 * 1024, 512, 0}, - {"N25Q256A", 0x20bb19, 0x0, 64 * 1024, 512, 0}, - {"N25Q512", 0x20ba20, 0x0, 64 * 1024, 1024, 0}, - {"N25Q512A", 0x20bb20, 0x0, 64 * 1024, 1024, 0}, - {"N25Q1024", 0x20ba21, 0x0, 64 * 1024, 2048, 0}, - {"N25Q1024A", 0x20bb21, 0x0, 64 * 1024, 2048, 0}, + {"M25P10", 0x202011, 0x0, 32 * 1024, 4, 0}, + {"M25P20", 0x202012, 0x0, 64 * 1024, 4, 0}, + {"M25P40", 0x202013, 0x0, 64 * 1024, 8, 0}, + {"M25P80", 0x202014, 0x0, 64 * 1024, 16, 0}, + {"M25P16", 0x202015, 0x0, 64 * 1024, 32, 0}, + {"M25P32", 0x202016, 0x0, 64 * 1024, 64, 0}, + {"M25P64", 0x202017, 0x0, 64 * 1024, 128, 0}, + {"M25P128", 0x202018, 0x0, 256 * 1024, 64, 0}, + {"N25Q32", 0x20ba16, 0x0, 64 * 1024, 64, SECT_4K}, + {"N25Q32A", 0x20bb16, 0x0, 64 * 1024, 64, SECT_4K}, + {"N25Q64", 0x20ba17, 0x0, 64 * 1024, 128, SECT_4K}, + {"N25Q64A", 0x20bb17, 0x0, 64 * 1024, 128, SECT_4K}, + {"N25Q128", 0x20ba18, 0x0, 64 * 1024, 256, SECT_4K}, + {"N25Q128A", 0x20bb18, 0x0, 64 * 1024, 256, SECT_4K}, + {"N25Q256", 0x20ba19, 0x0, 64 * 1024, 512, SECT_4K}, + {"N25Q256A", 0x20bb19, 0x0, 64 * 1024, 512, SECT_4K}, + {"N25Q512", 0x20ba20, 0x0, 64 * 1024, 1024, SECT_4K}, + {"N25Q512A", 0x20bb20, 0x0, 64 * 1024, 1024, SECT_4K}, + {"N25Q1024", 0x20ba21, 0x0, 64 * 1024, 2048, SECT_4K}, + {"N25Q1024A", 0x20bb21, 0x0, 64 * 1024, 2048, SECT_4K}, #endif #ifdef CONFIG_SPI_FLASH_SST /* SST */ - {"SST25VF040B", 0xbf258d, 0x0, 64 * 1024, 8, SST_WP}, - {"SST25VF080B", 0xbf258e, 0x0, 64 * 1024, 16, SST_WP}, - {"SST25VF016B", 0xbf2541, 0x0, 64 * 1024, 32, SST_WP}, - {"SST25VF032B", 0xbf254a, 0x0, 64 * 1024, 64, SST_WP}, - {"SST25VF064C", 0xbf254b, 0x0, 64 * 1024, 128, 0}, - {"SST25WF512", 0xbf2501, 0x0, 64 * 1024, 1, SST_WP}, - {"SST25WF010", 0xbf2502, 0x0, 64 * 1024, 2, SST_WP}, - {"SST25WF020", 0xbf2503, 0x0, 64 * 1024, 4, SST_WP}, - {"SST25WF040", 0xbf2504, 0x0, 64 * 1024, 8, SST_WP}, - {"SST25WF080", 0xbf2505, 0x0, 64 * 1024, 16, SST_WP}, + {"SST25VF040B", 0xbf258d, 0x0, 64 * 1024, 8, SECT_4K | SST_WP}, + {"SST25VF080B", 0xbf258e, 0x0, 64 * 1024, 16, SECT_4K | SST_WP}, + {"SST25VF016B", 0xbf2541, 0x0, 64 * 1024, 32, SECT_4K | SST_WP}, + {"SST25VF032B", 0xbf254a, 0x0, 64 * 1024, 64, SECT_4K | SST_WP}, + {"SST25VF064C", 0xbf254b, 0x0, 64 * 1024, 128, SECT_4K}, + {"SST25WF512", 0xbf2501, 0x0, 64 * 1024, 1, SECT_4K | SST_WP}, + {"SST25WF010", 0xbf2502, 0x0, 64 * 1024, 2, SECT_4K | SST_WP}, + {"SST25WF020", 0xbf2503, 0x0, 64 * 1024, 4, SECT_4K | SST_WP}, + {"SST25WF040", 0xbf2504, 0x0, 64 * 1024, 8, SECT_4K | SST_WP}, + {"SST25WF080", 0xbf2505, 0x0, 64 * 1024, 16, SECT_4K | SST_WP}, #endif #ifdef CONFIG_SPI_FLASH_WINBOND /* WINBOND */ - {"W25P80", 0xef2014, 0x0, 64 * 1024, 16, 0}, - {"W25P16", 0xef2015, 0x0, 64 * 1024, 32, 0}, - {"W25P32", 0xef2016, 0x0, 64 * 1024, 64, 0}, - {"W25X40", 0xef3013, 0x0, 64 * 1024, 8, 0}, - {"W25X16", 0xef3015, 0x0, 64 * 1024, 32, 0}, - {"W25X32", 0xef3016, 0x0, 64 * 1024, 64, 0}, - {"W25X64", 0xef3017, 0x0, 64 * 1024, 128, 0}, - {"W25Q80BL", 0xef4014, 0x0, 64 * 1024, 16, 0}, - {"W25Q16CL", 0xef4015, 0x0, 64 * 1024, 32, 0}, - {"W25Q32BV", 0xef4016, 0x0, 64 * 1024, 64, 0}, - {"W25Q64CV", 0xef4017, 0x0, 64 * 1024, 128, 0}, - {"W25Q128BV", 0xef4018, 0x0, 64 * 1024, 256, 0}, - {"W25Q256", 0xef4019, 0x0, 64 * 1024, 512, 0}, - {"W25Q80BW", 0xef5014, 0x0, 64 * 1024, 16, 0}, - {"W25Q16DW", 0xef6015, 0x0, 64 * 1024, 32, 0}, - {"W25Q32DW", 0xef6016, 0x0, 64 * 1024, 64, 0}, - {"W25Q64DW", 0xef6017, 0x0, 64 * 1024, 128, 0}, - {"W25Q128FW", 0xef6018, 0x0, 64 * 1024, 256, 0}, + {"W25P80", 0xef2014, 0x0, 64 * 1024, 16, 0}, + {"W25P16", 0xef2015, 0x0, 64 * 1024, 32, 0}, + {"W25P32", 0xef2016, 0x0, 64 * 1024, 64, 0}, + {"W25X40", 0xef3013, 0x0, 64 * 1024, 8, SECT_4K}, + {"W25X16", 0xef3015, 0x0, 64 * 1024, 32, SECT_4K}, + {"W25X32", 0xef3016, 0x0, 64 * 1024, 64, SECT_4K}, + {"W25X64", 0xef3017, 0x0, 64 * 1024, 128, SECT_4K}, + {"W25Q80BL", 0xef4014, 0x0, 64 * 1024, 16, SECT_4K}, + {"W25Q16CL", 0xef4015, 0x0, 64 * 1024, 32, SECT_4K}, + {"W25Q32BV", 0xef4016, 0x0, 64 * 1024, 64, SECT_4K}, + {"W25Q64CV", 0xef4017, 0x0, 64 * 1024, 128, SECT_4K}, + {"W25Q128BV", 0xef4018, 0x0, 64 * 1024, 256, SECT_4K}, + {"W25Q256", 0xef4019, 0x0, 64 * 1024, 512, SECT_4K}, + {"W25Q80BW", 0xef5014, 0x0, 64 * 1024, 16, SECT_4K}, + {"W25Q16DW", 0xef6015, 0x0, 64 * 1024, 32, SECT_4K}, + {"W25Q32DW", 0xef6016, 0x0, 64 * 1024, 64, SECT_4K}, + {"W25Q64DW", 0xef6017, 0x0, 64 * 1024, 128, SECT_4K}, + {"W25Q128FW", 0xef6018, 0x0, 64 * 1024, 256, SECT_4K}, #endif /* * Note: @@ -203,6 +203,18 @@ struct spi_flash *spi_flash_validate_ids(struct spi_slave *spi, u8 *idcode) flash->sector_size = params->sector_size; flash->size = flash->sector_size * params->nr_sectors; + /* Compute erase sector and command */ + if (params->flags & SECT_4K) { + flash->erase_cmd = CMD_ERASE_4K; + flash->erase_size = 4096; + } else if (params->flags & SECT_32K) { + flash->erase_cmd = CMD_ERASE_32K; + flash->erase_size = 32768; + } else { + flash->erase_cmd = CMD_ERASE_64K; + flash->erase_size = flash->sector_size; + } + /* Flash powers up read-only, so clear BP# bits */ #if defined(CONFIG_SPI_FLASH_ATMEL) || \ defined(CONFIG_SPI_FLASH_MACRONIX) || \ diff --git a/include/spi_flash.h b/include/spi_flash.h index de262ed..0d40e6c 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -17,6 +17,10 @@ #include <linux/types.h> #include <linux/compiler.h> +/* SECT flags */ +#define SECT_4K (1 << 1) +#define SECT_32K (1 << 2) + /* SST specific macros */ #ifdef CONFIG_SPI_FLASH_SST # define SST_WP 0x01 /* Supports AAI word program */ @@ -33,8 +37,10 @@ struct spi_flash { u32 size; /* Write (page) size */ u32 page_size; - /* Erase (sector) size */ + /* Sector size */ u32 sector_size; + /* Erase size */ + u32 erase_size; #ifdef CONFIG_SPI_FLASH_BAR /* Bank read cmd */ u8 bank_read_cmd; @@ -45,6 +51,8 @@ struct spi_flash { #endif /* Poll cmd - for flash erase/program */ u8 poll_cmd; + /* Erase cmd 4K, 32K, 64K */ + u8 erase_cmd; void *memory_map; /* Address of read-only SPI flash access */ int (*read)(struct spi_flash *flash, u32 offset, -- 1.8.3

1 0

[U-Boot] [PATCH v5 13/32] sf: probe: Add support to clear flash BP# bits
by Jagannadha Sutradharudu Teki 02 Oct '13

02 Oct '13

Few of the flashes(Atmel, Macronix and SST) require to clear BP# bits in flash power ups. So clear these BP# bits at probe time, so-that the flash is ready for user operations. Signed-off-by: Jagannadha Sutradharudu Teki <jaganna(a)xilinx.com> --- Changes for v5: - Added macro for conditional compile Changes for v4: - none Changes for v3: - none Changes for v2: - none drivers/mtd/spi/spi_flash_probe.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/mtd/spi/spi_flash_probe.c b/drivers/mtd/spi/spi_flash_probe.c index 199eab8..4659134 100644 --- a/drivers/mtd/spi/spi_flash_probe.c +++ b/drivers/mtd/spi/spi_flash_probe.c @@ -203,6 +203,13 @@ struct spi_flash *spi_flash_validate_ids(struct spi_slave *spi, u8 *idcode) flash->sector_size = params->sector_size; flash->size = flash->sector_size * params->nr_sectors; + /* Flash powers up read-only, so clear BP# bits */ +#if defined(CONFIG_SPI_FLASH_ATMEL) || \ + defined(CONFIG_SPI_FLASH_MACRONIX) || \ + defined(CONFIG_SPI_FLASH_SST) + spi_flash_cmd_write_status(flash, 0); +#endif + return flash; } -- 1.8.3

1 0

[U-Boot] [PATCH v5 12/32] sf: probe: Add support for SST_WP
by Jagannadha Sutradharudu Teki 02 Oct '13

02 Oct '13

Most of the SST flashes needs to write up using SST_WP, AAI Word Program, so added a flag param on spi_flash_params table. SST flashes, which supports SST_WP need to use a WP write sst_write_wp instead of common flash write. Signed-off-by: Jagannadha Sutradharudu Teki <jaganna(a)xilinx.com> --- Changes for v5: - none Changes for v4: - none Changes for v3: - none Changes for v2: - none drivers/mtd/spi/spi_flash_internal.h | 5 ++ drivers/mtd/spi/spi_flash_ops.c | 93 ++++++++++++++++++++ drivers/mtd/spi/spi_flash_probe.c | 160 ++++++++++++++++++----------------- include/spi_flash.h | 7 ++ 4 files changed, 188 insertions(+), 77 deletions(-) diff --git a/drivers/mtd/spi/spi_flash_internal.h b/drivers/mtd/spi/spi_flash_internal.h index af1afa9..ce34ce0 100644 --- a/drivers/mtd/spi/spi_flash_internal.h +++ b/drivers/mtd/spi/spi_flash_internal.h @@ -75,6 +75,11 @@ int spi_flash_cmd_write(struct spi_slave *spi, const u8 *cmd, size_t cmd_len, int spi_flash_cmd_write_multi(struct spi_flash *flash, u32 offset, size_t len, const void *buf); +#ifdef CONFIG_SPI_FLASH_SST +int sst_write_wp(struct spi_flash *flash, u32 offset, size_t len, + const void *buf); +#endif + /* * Enable writing on the SPI flash. */ diff --git a/drivers/mtd/spi/spi_flash_ops.c b/drivers/mtd/spi/spi_flash_ops.c index 6133363..79381b1 100644 --- a/drivers/mtd/spi/spi_flash_ops.c +++ b/drivers/mtd/spi/spi_flash_ops.c @@ -312,3 +312,96 @@ int spi_flash_cmd_read_fast(struct spi_flash *flash, u32 offset, return ret; } + +#ifdef CONFIG_SPI_FLASH_SST +static int sst_byte_write(struct spi_flash *flash, u32 offset, const void *buf) +{ + int ret; + u8 cmd[4] = { + CMD_SST_BP, + offset >> 16, + offset >> 8, + offset, + }; + + debug("BP[%02x]: 0x%p => cmd = { 0x%02x 0x%06x }\n", + spi_w8r8(flash->spi, CMD_READ_STATUS), buf, cmd[0], offset); + + ret = spi_flash_cmd_write_enable(flash); + if (ret) + return ret; + + ret = spi_flash_cmd_write(flash->spi, cmd, sizeof(cmd), buf, 1); + if (ret) + return ret; + + return spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT); +} + +int sst_write_wp(struct spi_flash *flash, u32 offset, size_t len, + const void *buf) +{ + size_t actual, cmd_len; + int ret; + u8 cmd[4]; + + ret = spi_claim_bus(flash->spi); + if (ret) { + debug("SF: Unable to claim SPI bus\n"); + return ret; + } + + /* If the data is not word aligned, write out leading single byte */ + actual = offset % 2; + if (actual) { + ret = sst_byte_write(flash, offset, buf); + if (ret) + goto done; + } + offset += actual; + + ret = spi_flash_cmd_write_enable(flash); + if (ret) + goto done; + + cmd_len = 4; + cmd[0] = CMD_SST_AAI_WP; + cmd[1] = offset >> 16; + cmd[2] = offset >> 8; + cmd[3] = offset; + + for (; actual < len - 1; actual += 2) { + debug("WP[%02x]: 0x%p => cmd = { 0x%02x 0x%06x }\n", + spi_w8r8(flash->spi, CMD_READ_STATUS), buf + actual, + cmd[0], offset); + + ret = spi_flash_cmd_write(flash->spi, cmd, cmd_len, + buf + actual, 2); + if (ret) { + debug("SF: sst word program failed\n"); + break; + } + + ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT); + if (ret) + break; + + cmd_len = 1; + offset += 2; + } + + if (!ret) + ret = spi_flash_cmd_write_disable(flash); + + /* If there is a single trailing byte, write it out */ + if (!ret && actual != len) + ret = sst_byte_write(flash, offset, buf + actual); + + done: + debug("SF: sst: program %s %zu bytes @ 0x%zx\n", + ret ? "failure" : "success", len, offset - actual); + + spi_release_bus(flash->spi); + return ret; +} +#endif diff --git a/drivers/mtd/spi/spi_flash_probe.c b/drivers/mtd/spi/spi_flash_probe.c index b6cf60c..199eab8 100644 --- a/drivers/mtd/spi/spi_flash_probe.c +++ b/drivers/mtd/spi/spi_flash_probe.c @@ -26,6 +26,7 @@ DECLARE_GLOBAL_DATA_PTR; * @ext_jedec: Device ext_jedec ID * @sector_size: Sector size of this device * @nr_sectors: No.of sectors on this device + * @flags: Importent param, for flash specific behaviour */ struct spi_flash_params { const char *name; @@ -33,101 +34,102 @@ struct spi_flash_params { u16 ext_jedec; u32 sector_size; u32 nr_sectors; + u16 flags; }; static const struct spi_flash_params spi_flash_params_table[] = { #ifdef CONFIG_SPI_FLASH_ATMEL /* ATMEL */ - {"AT45DB011D", 0x1f2200, 0x0, 64 * 1024, 4}, - {"AT45DB021D", 0x1f2300, 0x0, 64 * 1024, 8}, - {"AT45DB041D", 0x1f2400, 0x0, 64 * 1024, 8}, - {"AT45DB081D", 0x1f2500, 0x0, 64 * 1024, 16}, - {"AT45DB161D", 0x1f2600, 0x0, 64 * 1024, 32}, - {"AT45DB321D", 0x1f2700, 0x0, 64 * 1024, 64}, - {"AT45DB641D", 0x1f2800, 0x0, 64 * 1024, 128}, + {"AT45DB011D", 0x1f2200, 0x0, 64 * 1024, 4, 0}, + {"AT45DB021D", 0x1f2300, 0x0, 64 * 1024, 8, 0}, + {"AT45DB041D", 0x1f2400, 0x0, 64 * 1024, 8, 0}, + {"AT45DB081D", 0x1f2500, 0x0, 64 * 1024, 16, 0}, + {"AT45DB161D", 0x1f2600, 0x0, 64 * 1024, 32, 0}, + {"AT45DB321D", 0x1f2700, 0x0, 64 * 1024, 64, 0}, + {"AT45DB641D", 0x1f2800, 0x0, 64 * 1024, 128, 0}, #endif #ifdef CONFIG_SPI_FLASH_EON /* EON */ - {"EN25Q32B", 0x1c3016, 0x0, 64 * 1024, 64}, - {"EN25Q128B", 0x1c3018, 0x0, 64 * 1024, 256}, + {"EN25Q32B", 0x1c3016, 0x0, 64 * 1024, 64, 0}, + {"EN25Q128B", 0x1c3018, 0x0, 64 * 1024, 256, 0}, #endif #ifdef CONFIG_SPI_FLASH_GIGADEVICE /* GIGADEVICE */ - {"GD25Q64B", 0xc84017, 0x0, 64 * 1024, 128}, - {"GD25LQ32", 0xc86016, 0x0, 64 * 1024, 64}, + {"GD25Q64B", 0xc84017, 0x0, 64 * 1024, 128, 0}, + {"GD25LQ32", 0xc86016, 0x0, 64 * 1024, 64, 0}, #endif #ifdef CONFIG_SPI_FLASH_MACRONIX /* MACRONIX */ - {"MX25L4005", 0xc22013, 0x0, 64 * 1024, 8}, - {"MX25L8005", 0xc22014, 0x0, 64 * 1024, 16}, - {"MX25L1605D", 0xc22015, 0x0, 64 * 1024, 32}, - {"MX25L3205D", 0xc22016, 0x0, 64 * 1024, 64}, - {"MX25L6405D", 0xc22017, 0x0, 64 * 1024, 128}, - {"MX25L12805", 0xc22018, 0x0, 64 * 1024, 256}, - {"MX25L12855E", 0xc22618, 0x0, 64 * 1024, 256}, + {"MX25L4005", 0xc22013, 0x0, 64 * 1024, 8, 0}, + {"MX25L8005", 0xc22014, 0x0, 64 * 1024, 16, 0}, + {"MX25L1605D", 0xc22015, 0x0, 64 * 1024, 32, 0}, + {"MX25L3205D", 0xc22016, 0x0, 64 * 1024, 64, 0}, + {"MX25L6405D", 0xc22017, 0x0, 64 * 1024, 128, 0}, + {"MX25L12805", 0xc22018, 0x0, 64 * 1024, 256, 0}, + {"MX25L12855E", 0xc22618, 0x0, 64 * 1024, 256, 0}, #endif #ifdef CONFIG_SPI_FLASH_SPANSION /* SPANSION */ - {"S25FL008A", 0x010213, 0x0, 64 * 1024, 16}, - {"S25FL016A", 0x010214, 0x0, 64 * 1024, 32}, - {"S25FL032A", 0x010215, 0x0, 64 * 1024, 64}, - {"S25FL064A", 0x010216, 0x0, 64 * 1024, 128}, - {"S25FL128P_256K", 0x012018, 0x0300, 256 * 1024, 64}, - {"S25FL128P_64K", 0x012018, 0x0301, 64 * 1024, 256}, - {"S25FL032P", 0x010215, 0x4d00, 64 * 1024, 64}, - {"S25FL064P", 0x010216, 0x4d00, 64 * 1024, 128}, - {"S25FL128S_64K", 0x012018, 0x4d01, 64 * 1024, 256}, - {"S25FL256S_64K", 0x010219, 0x4d01, 64 * 1024, 512}, - {"S25FL512S_64K", 0x010220, 0x4d01, 64 * 1024, 1024}, + {"S25FL008A", 0x010213, 0x0, 64 * 1024, 16, 0}, + {"S25FL016A", 0x010214, 0x0, 64 * 1024, 32, 0}, + {"S25FL032A", 0x010215, 0x0, 64 * 1024, 64, 0}, + {"S25FL064A", 0x010216, 0x0, 64 * 1024, 128, 0}, + {"S25FL128P_256K", 0x012018, 0x0300, 256 * 1024, 64, 0}, + {"S25FL128P_64K", 0x012018, 0x0301, 64 * 1024, 256, 0}, + {"S25FL032P", 0x010215, 0x4d00, 64 * 1024, 64, 0}, + {"S25FL064P", 0x010216, 0x4d00, 64 * 1024, 128, 0}, + {"S25FL128S_64K", 0x012018, 0x4d01, 64 * 1024, 256, 0}, + {"S25FL256S_64K", 0x010219, 0x4d01, 64 * 1024, 512, 0}, + {"S25FL512S_64K", 0x010220, 0x4d01, 64 * 1024, 1024, 0}, #endif #ifdef CONFIG_SPI_FLASH_STMICRO /* STMICRO */ - {"M25P10", 0x202011, 0x0, 32 * 1024, 4}, - {"M25P20", 0x202012, 0x0, 64 * 1024, 4}, - {"M25P40", 0x202013, 0x0, 64 * 1024, 8}, - {"M25P80", 0x202014, 0x0, 64 * 1024, 16}, - {"M25P16", 0x202015, 0x0, 64 * 1024, 32}, - {"M25P32", 0x202016, 0x0, 64 * 1024, 64}, - {"M25P64", 0x202017, 0x0, 64 * 1024, 128}, - {"M25P128", 0x202018, 0x0, 256 * 1024, 64}, - {"N25Q32", 0x20ba16, 0x0, 64 * 1024, 64}, - {"N25Q32A", 0x20bb16, 0x0, 64 * 1024, 64}, - {"N25Q64", 0x20ba17, 0x0, 64 * 1024, 128}, - {"N25Q64A", 0x20bb17, 0x0, 64 * 1024, 128}, - {"N25Q128", 0x20ba18, 0x0, 64 * 1024, 256}, - {"N25Q128A", 0x20bb18, 0x0, 64 * 1024, 256}, - {"N25Q256", 0x20ba19, 0x0, 64 * 1024, 512}, - {"N25Q256A", 0x20bb19, 0x0, 64 * 1024, 512}, - {"N25Q512", 0x20ba20, 0x0, 64 * 1024, 1024}, - {"N25Q512A", 0x20bb20, 0x0, 64 * 1024, 1024}, - {"N25Q1024", 0x20ba21, 0x0, 64 * 1024, 2048}, - {"N25Q1024A", 0x20bb21, 0x0, 64 * 1024, 2048}, + {"M25P10", 0x202011, 0x0, 32 * 1024, 4, 0}, + {"M25P20", 0x202012, 0x0, 64 * 1024, 4, 0}, + {"M25P40", 0x202013, 0x0, 64 * 1024, 8, 0}, + {"M25P80", 0x202014, 0x0, 64 * 1024, 16, 0}, + {"M25P16", 0x202015, 0x0, 64 * 1024, 32, 0}, + {"M25P32", 0x202016, 0x0, 64 * 1024, 64, 0}, + {"M25P64", 0x202017, 0x0, 64 * 1024, 128, 0}, + {"M25P128", 0x202018, 0x0, 256 * 1024, 64, 0}, + {"N25Q32", 0x20ba16, 0x0, 64 * 1024, 64, 0}, + {"N25Q32A", 0x20bb16, 0x0, 64 * 1024, 64, 0}, + {"N25Q64", 0x20ba17, 0x0, 64 * 1024, 128, 0}, + {"N25Q64A", 0x20bb17, 0x0, 64 * 1024, 128, 0}, + {"N25Q128", 0x20ba18, 0x0, 64 * 1024, 256, 0}, + {"N25Q128A", 0x20bb18, 0x0, 64 * 1024, 256, 0}, + {"N25Q256", 0x20ba19, 0x0, 64 * 1024, 512, 0}, + {"N25Q256A", 0x20bb19, 0x0, 64 * 1024, 512, 0}, + {"N25Q512", 0x20ba20, 0x0, 64 * 1024, 1024, 0}, + {"N25Q512A", 0x20bb20, 0x0, 64 * 1024, 1024, 0}, + {"N25Q1024", 0x20ba21, 0x0, 64 * 1024, 2048, 0}, + {"N25Q1024A", 0x20bb21, 0x0, 64 * 1024, 2048, 0}, #endif #ifdef CONFIG_SPI_FLASH_SST /* SST */ - {"SST25VF040B", 0xbf258d, 0x0, 64 * 1024, 8}, - {"SST25VF080B", 0xbf258e, 0x0, 64 * 1024, 16}, - {"SST25VF016B", 0xbf2541, 0x0, 64 * 1024, 32}, - {"SST25VF032B", 0xbf254a, 0x0, 64 * 1024, 64}, - {"SST25VF064C", 0xbf254b, 0x0, 64 * 1024, 128}, - {"SST25WF512", 0xbf2501, 0x0, 64 * 1024, 1}, - {"SST25WF010", 0xbf2502, 0x0, 64 * 1024, 2}, - {"SST25WF020", 0xbf2503, 0x0, 64 * 1024, 4}, - {"SST25WF040", 0xbf2504, 0x0, 64 * 1024, 8}, - {"SST25WF080", 0xbf2505, 0x0, 64 * 1024, 16}, + {"SST25VF040B", 0xbf258d, 0x0, 64 * 1024, 8, SST_WP}, + {"SST25VF080B", 0xbf258e, 0x0, 64 * 1024, 16, SST_WP}, + {"SST25VF016B", 0xbf2541, 0x0, 64 * 1024, 32, SST_WP}, + {"SST25VF032B", 0xbf254a, 0x0, 64 * 1024, 64, SST_WP}, + {"SST25VF064C", 0xbf254b, 0x0, 64 * 1024, 128, 0}, + {"SST25WF512", 0xbf2501, 0x0, 64 * 1024, 1, SST_WP}, + {"SST25WF010", 0xbf2502, 0x0, 64 * 1024, 2, SST_WP}, + {"SST25WF020", 0xbf2503, 0x0, 64 * 1024, 4, SST_WP}, + {"SST25WF040", 0xbf2504, 0x0, 64 * 1024, 8, SST_WP}, + {"SST25WF080", 0xbf2505, 0x0, 64 * 1024, 16, SST_WP}, #endif #ifdef CONFIG_SPI_FLASH_WINBOND /* WINBOND */ - {"W25P80", 0xef2014, 0x0, 64 * 1024, 16}, - {"W25P16", 0xef2015, 0x0, 64 * 1024, 32}, - {"W25P32", 0xef2016, 0x0, 64 * 1024, 64}, - {"W25X40", 0xef3013, 0x0, 64 * 1024, 8}, - {"W25X16", 0xef3015, 0x0, 64 * 1024, 32}, - {"W25X32", 0xef3016, 0x0, 64 * 1024, 64}, - {"W25X64", 0xef3017, 0x0, 64 * 1024, 128}, - {"W25Q80BL", 0xef4014, 0x0, 64 * 1024, 16}, - {"W25Q16CL", 0xef4015, 0x0, 64 * 1024, 32}, - {"W25Q32BV", 0xef4016, 0x0, 64 * 1024, 64}, - {"W25Q64CV", 0xef4017, 0x0, 64 * 1024, 128}, - {"W25Q128BV", 0xef4018, 0x0, 64 * 1024, 256}, - {"W25Q256", 0xef4019, 0x0, 64 * 1024, 512}, - {"W25Q80BW", 0xef5014, 0x0, 64 * 1024, 16}, - {"W25Q16DW", 0xef6015, 0x0, 64 * 1024, 32}, - {"W25Q32DW", 0xef6016, 0x0, 64 * 1024, 64}, - {"W25Q64DW", 0xef6017, 0x0, 64 * 1024, 128}, - {"W25Q128FW", 0xef6018, 0x0, 64 * 1024, 256}, + {"W25P80", 0xef2014, 0x0, 64 * 1024, 16, 0}, + {"W25P16", 0xef2015, 0x0, 64 * 1024, 32, 0}, + {"W25P32", 0xef2016, 0x0, 64 * 1024, 64, 0}, + {"W25X40", 0xef3013, 0x0, 64 * 1024, 8, 0}, + {"W25X16", 0xef3015, 0x0, 64 * 1024, 32, 0}, + {"W25X32", 0xef3016, 0x0, 64 * 1024, 64, 0}, + {"W25X64", 0xef3017, 0x0, 64 * 1024, 128, 0}, + {"W25Q80BL", 0xef4014, 0x0, 64 * 1024, 16, 0}, + {"W25Q16CL", 0xef4015, 0x0, 64 * 1024, 32, 0}, + {"W25Q32BV", 0xef4016, 0x0, 64 * 1024, 64, 0}, + {"W25Q64CV", 0xef4017, 0x0, 64 * 1024, 128, 0}, + {"W25Q128BV", 0xef4018, 0x0, 64 * 1024, 256, 0}, + {"W25Q256", 0xef4019, 0x0, 64 * 1024, 512, 0}, + {"W25Q80BW", 0xef5014, 0x0, 64 * 1024, 16, 0}, + {"W25Q16DW", 0xef6015, 0x0, 64 * 1024, 32, 0}, + {"W25Q32DW", 0xef6016, 0x0, 64 * 1024, 64, 0}, + {"W25Q64DW", 0xef6017, 0x0, 64 * 1024, 128, 0}, + {"W25Q128FW", 0xef6018, 0x0, 64 * 1024, 256, 0}, #endif /* * Note: @@ -189,6 +191,10 @@ struct spi_flash *spi_flash_validate_ids(struct spi_slave *spi, u8 *idcode) /* Assign spi_flash ops */ flash->write = spi_flash_cmd_write_multi; +#ifdef CONFIG_SPI_FLASH_SST + if (params->flags & SST_WP) + flash->write = sst_write_wp; +#endif flash->erase = spi_flash_cmd_erase; flash->read = spi_flash_cmd_read_fast; diff --git a/include/spi_flash.h b/include/spi_flash.h index bfc59aa..de262ed 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -17,6 +17,13 @@ #include <linux/types.h> #include <linux/compiler.h> +/* SST specific macros */ +#ifdef CONFIG_SPI_FLASH_SST +# define SST_WP 0x01 /* Supports AAI word program */ +# define CMD_SST_BP 0x02 /* Byte Program */ +# define CMD_SST_AAI_WP 0xAD /* Auto Address Incr Word Program */ +#endif + struct spi_flash { struct spi_slave *spi; -- 1.8.3

1 0

[U-Boot] [PATCH v5 11/32] sf: probe: Give proper spacing on flash table params
by Jagannadha Sutradharudu Teki 02 Oct '13

02 Oct '13

Given proper spacing between flash table params. Signed-off-by: Jagannadha Sutradharudu Teki <jaganna(a)xilinx.com> --- Changes for v5: - none Changes for v4: - none Changes for v3: - none Changes for v2: - none drivers/mtd/spi/spi_flash_probe.c | 154 +++++++++++++++++++------------------- 1 file changed, 77 insertions(+), 77 deletions(-) diff --git a/drivers/mtd/spi/spi_flash_probe.c b/drivers/mtd/spi/spi_flash_probe.c index af43272..b6cf60c 100644 --- a/drivers/mtd/spi/spi_flash_probe.c +++ b/drivers/mtd/spi/spi_flash_probe.c @@ -37,97 +37,97 @@ struct spi_flash_params { static const struct spi_flash_params spi_flash_params_table[] = { #ifdef CONFIG_SPI_FLASH_ATMEL /* ATMEL */ - {"AT45DB011D", 0x1f2200, 0x0, 64 * 1024, 4}, - {"AT45DB021D", 0x1f2300, 0x0, 64 * 1024, 8}, - {"AT45DB041D", 0x1f2400, 0x0, 64 * 1024, 8}, - {"AT45DB081D", 0x1f2500, 0x0, 64 * 1024, 16}, - {"AT45DB161D", 0x1f2600, 0x0, 64 * 1024, 32}, - {"AT45DB321D", 0x1f2700, 0x0, 64 * 1024, 64}, - {"AT45DB641D", 0x1f2800, 0x0, 64 * 1024, 128}, + {"AT45DB011D", 0x1f2200, 0x0, 64 * 1024, 4}, + {"AT45DB021D", 0x1f2300, 0x0, 64 * 1024, 8}, + {"AT45DB041D", 0x1f2400, 0x0, 64 * 1024, 8}, + {"AT45DB081D", 0x1f2500, 0x0, 64 * 1024, 16}, + {"AT45DB161D", 0x1f2600, 0x0, 64 * 1024, 32}, + {"AT45DB321D", 0x1f2700, 0x0, 64 * 1024, 64}, + {"AT45DB641D", 0x1f2800, 0x0, 64 * 1024, 128}, #endif #ifdef CONFIG_SPI_FLASH_EON /* EON */ - {"EN25Q32B", 0x1c3016, 0x0, 64 * 1024, 64}, - {"EN25Q128B", 0x1c3018, 0x0, 64 * 1024, 256}, + {"EN25Q32B", 0x1c3016, 0x0, 64 * 1024, 64}, + {"EN25Q128B", 0x1c3018, 0x0, 64 * 1024, 256}, #endif #ifdef CONFIG_SPI_FLASH_GIGADEVICE /* GIGADEVICE */ - {"GD25Q64B", 0xc84017, 0x0, 64 * 1024, 128}, - {"GD25LQ32", 0xc86016, 0x0, 64 * 1024, 64}, + {"GD25Q64B", 0xc84017, 0x0, 64 * 1024, 128}, + {"GD25LQ32", 0xc86016, 0x0, 64 * 1024, 64}, #endif #ifdef CONFIG_SPI_FLASH_MACRONIX /* MACRONIX */ - {"MX25L4005", 0xc22013, 0x0, 64 * 1024, 8}, - {"MX25L8005", 0xc22014, 0x0, 64 * 1024, 16}, - {"MX25L1605D", 0xc22015, 0x0, 64 * 1024, 32}, - {"MX25L3205D", 0xc22016, 0x0, 64 * 1024, 64}, - {"MX25L6405D", 0xc22017, 0x0, 64 * 1024, 128}, - {"MX25L12805", 0xc22018, 0x0, 64 * 1024, 256}, - {"MX25L12855E", 0xc22618, 0x0, 64 * 1024, 256}, + {"MX25L4005", 0xc22013, 0x0, 64 * 1024, 8}, + {"MX25L8005", 0xc22014, 0x0, 64 * 1024, 16}, + {"MX25L1605D", 0xc22015, 0x0, 64 * 1024, 32}, + {"MX25L3205D", 0xc22016, 0x0, 64 * 1024, 64}, + {"MX25L6405D", 0xc22017, 0x0, 64 * 1024, 128}, + {"MX25L12805", 0xc22018, 0x0, 64 * 1024, 256}, + {"MX25L12855E", 0xc22618, 0x0, 64 * 1024, 256}, #endif #ifdef CONFIG_SPI_FLASH_SPANSION /* SPANSION */ - {"S25FL008A", 0x010213, 0x0, 64 * 1024, 16}, - {"S25FL016A", 0x010214, 0x0, 64 * 1024, 32}, - {"S25FL032A", 0x010215, 0x0, 64 * 1024, 64}, - {"S25FL064A", 0x010216, 0x0, 64 * 1024, 128}, - {"S25FL128P_256K", 0x012018, 0x0300, 256 * 1024, 64}, - {"S25FL128P_64K", 0x012018, 0x0301, 64 * 1024, 256}, - {"S25FL032P", 0x010215, 0x4d00, 64 * 1024, 64}, - {"S25FL064P", 0x010216, 0x4d00, 64 * 1024, 128}, - {"S25FL128S_64K", 0x012018, 0x4d01, 64 * 1024, 256}, - {"S25FL256S_64K", 0x010219, 0x4d01, 64 * 1024, 512}, - {"S25FL512S_64K", 0x010220, 0x4d01, 64 * 1024, 1024}, + {"S25FL008A", 0x010213, 0x0, 64 * 1024, 16}, + {"S25FL016A", 0x010214, 0x0, 64 * 1024, 32}, + {"S25FL032A", 0x010215, 0x0, 64 * 1024, 64}, + {"S25FL064A", 0x010216, 0x0, 64 * 1024, 128}, + {"S25FL128P_256K", 0x012018, 0x0300, 256 * 1024, 64}, + {"S25FL128P_64K", 0x012018, 0x0301, 64 * 1024, 256}, + {"S25FL032P", 0x010215, 0x4d00, 64 * 1024, 64}, + {"S25FL064P", 0x010216, 0x4d00, 64 * 1024, 128}, + {"S25FL128S_64K", 0x012018, 0x4d01, 64 * 1024, 256}, + {"S25FL256S_64K", 0x010219, 0x4d01, 64 * 1024, 512}, + {"S25FL512S_64K", 0x010220, 0x4d01, 64 * 1024, 1024}, #endif #ifdef CONFIG_SPI_FLASH_STMICRO /* STMICRO */ - {"M25P10", 0x202011, 0x0, 32 * 1024, 4}, - {"M25P20", 0x202012, 0x0, 64 * 1024, 4}, - {"M25P40", 0x202013, 0x0, 64 * 1024, 8}, - {"M25P80", 0x202014, 0x0, 64 * 1024, 16}, - {"M25P16", 0x202015, 0x0, 64 * 1024, 32}, - {"M25P32", 0x202016, 0x0, 64 * 1024, 64}, - {"M25P64", 0x202017, 0x0, 64 * 1024, 128}, - {"M25P128", 0x202018, 0x0, 256 * 1024, 64}, - {"N25Q32", 0x20ba16, 0x0, 64 * 1024, 64}, - {"N25Q32A", 0x20bb16, 0x0, 64 * 1024, 64}, - {"N25Q64", 0x20ba17, 0x0, 64 * 1024, 128}, - {"N25Q64A", 0x20bb17, 0x0, 64 * 1024, 128}, - {"N25Q128", 0x20ba18, 0x0, 64 * 1024, 256}, - {"N25Q128A", 0x20bb18, 0x0, 64 * 1024, 256}, - {"N25Q256", 0x20ba19, 0x0, 64 * 1024, 512}, - {"N25Q256A", 0x20bb19, 0x0, 64 * 1024, 512}, - {"N25Q512", 0x20ba20, 0x0, 64 * 1024, 1024}, - {"N25Q512A", 0x20bb20, 0x0, 64 * 1024, 1024}, - {"N25Q1024", 0x20ba21, 0x0, 64 * 1024, 2048}, - {"N25Q1024A", 0x20bb21, 0x0, 64 * 1024, 2048}, + {"M25P10", 0x202011, 0x0, 32 * 1024, 4}, + {"M25P20", 0x202012, 0x0, 64 * 1024, 4}, + {"M25P40", 0x202013, 0x0, 64 * 1024, 8}, + {"M25P80", 0x202014, 0x0, 64 * 1024, 16}, + {"M25P16", 0x202015, 0x0, 64 * 1024, 32}, + {"M25P32", 0x202016, 0x0, 64 * 1024, 64}, + {"M25P64", 0x202017, 0x0, 64 * 1024, 128}, + {"M25P128", 0x202018, 0x0, 256 * 1024, 64}, + {"N25Q32", 0x20ba16, 0x0, 64 * 1024, 64}, + {"N25Q32A", 0x20bb16, 0x0, 64 * 1024, 64}, + {"N25Q64", 0x20ba17, 0x0, 64 * 1024, 128}, + {"N25Q64A", 0x20bb17, 0x0, 64 * 1024, 128}, + {"N25Q128", 0x20ba18, 0x0, 64 * 1024, 256}, + {"N25Q128A", 0x20bb18, 0x0, 64 * 1024, 256}, + {"N25Q256", 0x20ba19, 0x0, 64 * 1024, 512}, + {"N25Q256A", 0x20bb19, 0x0, 64 * 1024, 512}, + {"N25Q512", 0x20ba20, 0x0, 64 * 1024, 1024}, + {"N25Q512A", 0x20bb20, 0x0, 64 * 1024, 1024}, + {"N25Q1024", 0x20ba21, 0x0, 64 * 1024, 2048}, + {"N25Q1024A", 0x20bb21, 0x0, 64 * 1024, 2048}, #endif #ifdef CONFIG_SPI_FLASH_SST /* SST */ - {"SST25VF040B", 0xbf258d, 0x0, 64 * 1024, 8}, - {"SST25VF080B", 0xbf258e, 0x0, 64 * 1024, 16}, - {"SST25VF016B", 0xbf2541, 0x0, 64 * 1024, 32}, - {"SST25VF032B", 0xbf254a, 0x0, 64 * 1024, 64}, - {"SST25VF064C", 0xbf254b, 0x0, 64 * 1024, 128}, - {"SST25WF512", 0xbf2501, 0x0, 64 * 1024, 1}, - {"SST25WF010", 0xbf2502, 0x0, 64 * 1024, 2}, - {"SST25WF020", 0xbf2503, 0x0, 64 * 1024, 4}, - {"SST25WF040", 0xbf2504, 0x0, 64 * 1024, 8}, - {"SST25WF080", 0xbf2505, 0x0, 64 * 1024, 16}, + {"SST25VF040B", 0xbf258d, 0x0, 64 * 1024, 8}, + {"SST25VF080B", 0xbf258e, 0x0, 64 * 1024, 16}, + {"SST25VF016B", 0xbf2541, 0x0, 64 * 1024, 32}, + {"SST25VF032B", 0xbf254a, 0x0, 64 * 1024, 64}, + {"SST25VF064C", 0xbf254b, 0x0, 64 * 1024, 128}, + {"SST25WF512", 0xbf2501, 0x0, 64 * 1024, 1}, + {"SST25WF010", 0xbf2502, 0x0, 64 * 1024, 2}, + {"SST25WF020", 0xbf2503, 0x0, 64 * 1024, 4}, + {"SST25WF040", 0xbf2504, 0x0, 64 * 1024, 8}, + {"SST25WF080", 0xbf2505, 0x0, 64 * 1024, 16}, #endif #ifdef CONFIG_SPI_FLASH_WINBOND /* WINBOND */ - {"W25P80", 0xef2014, 0x0, 64 * 1024, 16}, - {"W25P16", 0xef2015, 0x0, 64 * 1024, 32}, - {"W25P32", 0xef2016, 0x0, 64 * 1024, 64}, - {"W25X40", 0xef3013, 0x0, 64 * 1024, 8}, - {"W25X16", 0xef3015, 0x0, 64 * 1024, 32}, - {"W25X32", 0xef3016, 0x0, 64 * 1024, 64}, - {"W25X64", 0xef3017, 0x0, 64 * 1024, 128}, - {"W25Q80BL", 0xef4014, 0x0, 64 * 1024, 16}, - {"W25Q16CL", 0xef4015, 0x0, 64 * 1024, 32}, - {"W25Q32BV", 0xef4016, 0x0, 64 * 1024, 64}, - {"W25Q64CV", 0xef4017, 0x0, 64 * 1024, 128}, - {"W25Q128BV", 0xef4018, 0x0, 64 * 1024, 256}, - {"W25Q256", 0xef4019, 0x0, 64 * 1024, 512}, - {"W25Q80BW", 0xef5014, 0x0, 64 * 1024, 16}, - {"W25Q16DW", 0xef6015, 0x0, 64 * 1024, 32}, - {"W25Q32DW", 0xef6016, 0x0, 64 * 1024, 64}, - {"W25Q64DW", 0xef6017, 0x0, 64 * 1024, 128}, - {"W25Q128FW", 0xef6018, 0x0, 64 * 1024, 256}, + {"W25P80", 0xef2014, 0x0, 64 * 1024, 16}, + {"W25P16", 0xef2015, 0x0, 64 * 1024, 32}, + {"W25P32", 0xef2016, 0x0, 64 * 1024, 64}, + {"W25X40", 0xef3013, 0x0, 64 * 1024, 8}, + {"W25X16", 0xef3015, 0x0, 64 * 1024, 32}, + {"W25X32", 0xef3016, 0x0, 64 * 1024, 64}, + {"W25X64", 0xef3017, 0x0, 64 * 1024, 128}, + {"W25Q80BL", 0xef4014, 0x0, 64 * 1024, 16}, + {"W25Q16CL", 0xef4015, 0x0, 64 * 1024, 32}, + {"W25Q32BV", 0xef4016, 0x0, 64 * 1024, 64}, + {"W25Q64CV", 0xef4017, 0x0, 64 * 1024, 128}, + {"W25Q128BV", 0xef4018, 0x0, 64 * 1024, 256}, + {"W25Q256", 0xef4019, 0x0, 64 * 1024, 512}, + {"W25Q80BW", 0xef5014, 0x0, 64 * 1024, 16}, + {"W25Q16DW", 0xef6015, 0x0, 64 * 1024, 32}, + {"W25Q32DW", 0xef6016, 0x0, 64 * 1024, 64}, + {"W25Q64DW", 0xef6017, 0x0, 64 * 1024, 128}, + {"W25Q128FW", 0xef6018, 0x0, 64 * 1024, 256}, #endif /* * Note: -- 1.8.3

1 0

[U-Boot] [PATCH v5 10/32] sf: probe: Add support for AT45DB* flash parts
by Jagannadha Sutradharudu Teki 02 Oct '13

02 Oct '13

Added AT45DB* parts are which are avilable in spi_flash_probe_legacy.c. Updated the sector_size attributes as per the flash parts. Looks fine for with this sector_size for computing the size of flash. Signed-off-by: Jagannadha Sutradharudu Teki <jaganna(a)xilinx.com> --- Changes for v5: - none Changes for v4: - none Changes for v3: - none Changes for v2: - Enable CONFIG_SPI_FLASH_ATMEL drivers/mtd/spi/spi_flash_probe.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/spi/spi_flash_probe.c b/drivers/mtd/spi/spi_flash_probe.c index d0955bf..af43272 100644 --- a/drivers/mtd/spi/spi_flash_probe.c +++ b/drivers/mtd/spi/spi_flash_probe.c @@ -36,6 +36,15 @@ struct spi_flash_params { }; static const struct spi_flash_params spi_flash_params_table[] = { +#ifdef CONFIG_SPI_FLASH_ATMEL /* ATMEL */ + {"AT45DB011D", 0x1f2200, 0x0, 64 * 1024, 4}, + {"AT45DB021D", 0x1f2300, 0x0, 64 * 1024, 8}, + {"AT45DB041D", 0x1f2400, 0x0, 64 * 1024, 8}, + {"AT45DB081D", 0x1f2500, 0x0, 64 * 1024, 16}, + {"AT45DB161D", 0x1f2600, 0x0, 64 * 1024, 32}, + {"AT45DB321D", 0x1f2700, 0x0, 64 * 1024, 64}, + {"AT45DB641D", 0x1f2800, 0x0, 64 * 1024, 128}, +#endif #ifdef CONFIG_SPI_FLASH_EON /* EON */ {"EN25Q32B", 0x1c3016, 0x0, 64 * 1024, 64}, {"EN25Q128B", 0x1c3018, 0x0, 64 * 1024, 256}, @@ -135,7 +144,6 @@ static const struct spi_flash_params spi_flash_params_table[] = { */ /* * TODO: - * ATMEL * RAMTRON */ }; -- 1.8.3

1 0

[U-Boot] [PATCH v5 09/32] sf: probe: Add support for SST25* flash parts
by Jagannadha Sutradharudu Teki 02 Oct '13

02 Oct '13

Added SST25* parts are which are avilable in spi_flash_probe_legacy.c. Updated the sector_size attributes as per the flash parts. Looks fine for with this sector_size for computing the size of flash. Signed-off-by: Jagannadha Sutradharudu Teki <jaganna(a)xilinx.com> Tested-by: Eric Nelson <eric.nelson(a)boundarydevices.com> --- Changes for v5: - none Changes for v4: - none Changes for v3: - none Changes for v2: - Enable CONFIG_SPI_FLASH_SST drivers/mtd/spi/spi_flash_probe.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/spi/spi_flash_probe.c b/drivers/mtd/spi/spi_flash_probe.c index a9ac571..d0955bf 100644 --- a/drivers/mtd/spi/spi_flash_probe.c +++ b/drivers/mtd/spi/spi_flash_probe.c @@ -88,6 +88,18 @@ static const struct spi_flash_params spi_flash_params_table[] = { {"N25Q1024", 0x20ba21, 0x0, 64 * 1024, 2048}, {"N25Q1024A", 0x20bb21, 0x0, 64 * 1024, 2048}, #endif +#ifdef CONFIG_SPI_FLASH_SST /* SST */ + {"SST25VF040B", 0xbf258d, 0x0, 64 * 1024, 8}, + {"SST25VF080B", 0xbf258e, 0x0, 64 * 1024, 16}, + {"SST25VF016B", 0xbf2541, 0x0, 64 * 1024, 32}, + {"SST25VF032B", 0xbf254a, 0x0, 64 * 1024, 64}, + {"SST25VF064C", 0xbf254b, 0x0, 64 * 1024, 128}, + {"SST25WF512", 0xbf2501, 0x0, 64 * 1024, 1}, + {"SST25WF010", 0xbf2502, 0x0, 64 * 1024, 2}, + {"SST25WF020", 0xbf2503, 0x0, 64 * 1024, 4}, + {"SST25WF040", 0xbf2504, 0x0, 64 * 1024, 8}, + {"SST25WF080", 0xbf2505, 0x0, 64 * 1024, 16}, +#endif #ifdef CONFIG_SPI_FLASH_WINBOND /* WINBOND */ {"W25P80", 0xef2014, 0x0, 64 * 1024, 16}, {"W25P16", 0xef2015, 0x0, 64 * 1024, 32}, @@ -125,7 +137,6 @@ static const struct spi_flash_params spi_flash_params_table[] = { * TODO: * ATMEL * RAMTRON - * SST */ }; -- 1.8.3

1 0