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

sf: dataflash: Move flash id detection into jedec_probe

Browse source 
Flash id detection should be the first step to enumerate
the connected flash on the board, once ie done checking
with respective id codes locally in the driver all this
should be part of jedec_probe instead of id detection and
validated through flash_info{} table separatly.

Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: York Sun <york.sun@nxp.com>
Signed-off-by: Jagan Teki <jagan@openedev.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jagan Teki <jagan@openedev.com>
This commit is contained in:
Jagan Teki 2016-10-30 23:16:28 +05:30
parent dc19b06ff2
commit 1835302d3c
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/mtd/spi/sf_dataflash.c
View file

@ -501,9 +501,10 @@ static struct flash_info dataflash_data[] = {
{ "at45db642d", 0x1f2800, 8192, 1024, 10, SUP_POW2PS | IS_POW2PS}, { "at45db642d", 0x1f2800, 8192, 1024, 10, SUP_POW2PS | IS_POW2PS},
}; };
static struct flash_info *jedec_probe(struct spi_slave *spi, u8 *id) static struct flash_info *jedec_probe(struct spi_slave *spi)
{ {
int tmp; int tmp;
uint8_t id[5];
uint32_t jedec; uint32_t jedec;
struct flash_info *info; struct flash_info *info;
int status; int status;
@ -517,6 +518,11 @@ static struct flash_info *jedec_probe(struct spi_slave *spi, u8 *id)
* That's not an error; only rev C and newer chips handle it, and * That's not an error; only rev C and newer chips handle it, and
* only Atmel sells these chips. * only Atmel sells these chips.
*/ */
tmp = spi_flash_cmd(spi, CMD_READ_ID, id, sizeof(id));
if (tmp < 0) {
printf("dataflash: error %d reading JEDEC ID\n", tmp);
return ERR_PTR(tmp);
}
if (id[0] != 0x1f) if (id[0] != 0x1f)
return NULL; return NULL;
@ -580,7 +586,6 @@ static int spi_dataflash_probe(struct udevice *dev)
struct spi_slave *spi = dev_get_parent_priv(dev); struct spi_slave *spi = dev_get_parent_priv(dev);
struct spi_flash *spi_flash; struct spi_flash *spi_flash;
struct flash_info *info; struct flash_info *info;
u8 idcode[5];
int ret, status = 0; int ret, status = 0;
spi_flash = dev_get_uclass_priv(dev); spi_flash = dev_get_uclass_priv(dev);
@ -591,12 +596,6 @@ static int spi_dataflash_probe(struct udevice *dev)
if (ret) if (ret)
return ret; return ret;
ret = spi_flash_cmd(spi, CMD_READ_ID, idcode, sizeof(idcode));
if (ret) {
printf("SPI DataFlash: Failed to get idcodes\n");
goto err_read_cmd;
}
/* /*
* Try to detect dataflash by JEDEC ID. * Try to detect dataflash by JEDEC ID.
* If it succeeds we know we have either a C or D part. * If it succeeds we know we have either a C or D part.
@ -604,7 +603,9 @@ static int spi_dataflash_probe(struct udevice *dev)
* Both support the security register, though with different * Both support the security register, though with different
* write procedures. * write procedures.
*/ */
info = jedec_probe(spi, idcode); info = jedec_probe(spi);
if (IS_ERR(info))
return PTR_ERR(info);
if (info != NULL) if (info != NULL)
add_dataflash(dev, info->name, info->nr_pages, add_dataflash(dev, info->name, info->nr_pages,
info->pagesize, info->pageoffset, info->pagesize, info->pageoffset,