GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 13:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sf: Move read_id code to sf_ops

Browse source 
read_id code is related to spi_flash stuff
hence moved to sf_ops.

Tested-by: Jagan Teki <jteki@openedev.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Jagan Teki <jteki@openedev.com>
This commit is contained in:
Jagan Teki 2015-09-29 18:06:04 +05:30
parent 3847c0c180
commit 1e90d9fd31
3 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/mtd/spi/sf_internal.h
View file

@ -248,7 +248,6 @@ void spi_flash_mtd_unregister(void);
/** /**
* spi_flash_scan - scan the SPI FLASH * spi_flash_scan - scan the SPI FLASH
* @spi: the spi slave structure * @spi: the spi slave structure
* @idcode: idcode of spi flash
* @flash: the spi flash structure * @flash: the spi flash structure
* *
* The drivers can use this fuction to scan the SPI FLASH. * The drivers can use this fuction to scan the SPI FLASH.
@ -257,6 +256,6 @@ void spi_flash_mtd_unregister(void);
* *
* Return: 0 for success, others for failure. * Return: 0 for success, others for failure.
*/ */
int spi_flash_scan(struct spi_slave *spi, u8 *idcode, struct spi_flash *flash); int spi_flash_scan(struct spi_slave *spi, struct spi_flash *flash);
#endif /* _SF_INTERNAL_H_ */ #endif /* _SF_INTERNAL_H_ */

21
drivers/mtd/spi/sf_ops.c
View file

@ -898,14 +898,29 @@ int spi_flash_decode_fdt(const void *blob, struct spi_flash *flash)
} }
#endif /* CONFIG_IS_ENABLED(OF_CONTROL) */ #endif /* CONFIG_IS_ENABLED(OF_CONTROL) */
int spi_flash_scan(struct spi_slave *spi, u8 *idcode, struct spi_flash *flash) int spi_flash_scan(struct spi_slave *spi, struct spi_flash *flash)
{ {
const struct spi_flash_params *params; const struct spi_flash_params *params;
u16 jedec, ext_jedec;
u8 idcode[5];
u8 cmd; u8 cmd;
u16 jedec = idcode[1] << 8 | idcode[2];
u16 ext_jedec = idcode[3] << 8 | idcode[4];
int ret; int ret;
/* Read the ID codes */
ret = spi_flash_cmd(spi, CMD_READ_ID, idcode, sizeof(idcode));
if (ret) {
printf("SF: Failed to get idcodes\n");
return -EINVAL;
}
#ifdef DEBUG
printf("SF: Got idcodes\n");
print_buffer(0, idcode, 1, sizeof(idcode), 0);
#endif
jedec = idcode[1] << 8 | idcode[2];
ext_jedec = idcode[3] << 8 | idcode[4];
/* Validate params from spi_flash_params table */ /* Validate params from spi_flash_params table */
params = spi_flash_params_table; params = spi_flash_params_table;
for (; params->name != NULL; params++) { for (; params->name != NULL; params++) {

15
drivers/mtd/spi/sf_probe.c
View file

@ -29,7 +29,6 @@
*/ */
int spi_flash_probe_slave(struct spi_slave *spi, struct spi_flash *flash) int spi_flash_probe_slave(struct spi_slave *spi, struct spi_flash *flash)
{ {
u8 idcode[5];
int ret; int ret;
/* Setup spi_slave */ /* Setup spi_slave */
@ -45,19 +44,7 @@ int spi_flash_probe_slave(struct spi_slave *spi, struct spi_flash *flash)
return ret; return ret;
} }
/* Read the ID codes */ ret = spi_flash_scan(spi, flash);
ret = spi_flash_cmd(spi, CMD_READ_ID, idcode, sizeof(idcode));
if (ret) {
printf("SF: Failed to get idcodes\n");
goto err_read_id;
}
#ifdef DEBUG
printf("SF: Got idcodes\n");
print_buffer(0, idcode, 1, sizeof(idcode), 0);
#endif
ret = spi_flash_scan(spi, idcode, flash);
if (ret) { if (ret) {
ret = -EINVAL; ret = -EINVAL;
goto err_read_id; goto err_read_id;