mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-07-27 13:23:44 +09:00
sf: sf_probe: Remove spi_slave pointer argument
Since spi_slave is a spi pointer in spi_flash{} then assign spi_slave{} pointer to flash->spi and remove spi_slave pointer argument to - spi_flash_probe_slave - spi_flash_scan 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:
parent
b6a2c436e0
commit
bfdb07eb4b
@ -227,7 +227,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
|
|
||||||
* @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.
|
||||||
@ -236,6 +235,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, struct spi_flash *flash);
|
int spi_flash_scan(struct spi_flash *flash);
|
||||||
|
|
||||||
#endif /* _SF_INTERNAL_H_ */
|
#endif /* _SF_INTERNAL_H_ */
|
||||||
|
@ -896,8 +896,9 @@ 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, struct spi_flash *flash)
|
int spi_flash_scan(struct spi_flash *flash)
|
||||||
{
|
{
|
||||||
|
struct spi_slave *spi = flash->spi;
|
||||||
const struct spi_flash_params *params;
|
const struct spi_flash_params *params;
|
||||||
u16 jedec, ext_jedec;
|
u16 jedec, ext_jedec;
|
||||||
u8 idcode[5];
|
u8 idcode[5];
|
||||||
@ -946,7 +947,6 @@ int spi_flash_scan(struct spi_slave *spi, struct spi_flash *flash)
|
|||||||
write_sr(flash, 0);
|
write_sr(flash, 0);
|
||||||
|
|
||||||
/* Assign spi data */
|
/* Assign spi data */
|
||||||
flash->spi = spi;
|
|
||||||
flash->name = params->name;
|
flash->name = params->name;
|
||||||
flash->memory_map = spi->memory_map;
|
flash->memory_map = spi->memory_map;
|
||||||
flash->dual_flash = flash->spi->option;
|
flash->dual_flash = flash->spi->option;
|
||||||
|
@ -20,12 +20,12 @@
|
|||||||
/**
|
/**
|
||||||
* spi_flash_probe_slave() - Probe for a SPI flash device on a bus
|
* spi_flash_probe_slave() - Probe for a SPI flash device on a bus
|
||||||
*
|
*
|
||||||
* @spi: Bus to probe
|
|
||||||
* @flashp: Pointer to place to put flash info, which may be NULL if the
|
* @flashp: Pointer to place to put flash info, which may be NULL if the
|
||||||
* space should be allocated
|
* space should be allocated
|
||||||
*/
|
*/
|
||||||
int spi_flash_probe_slave(struct spi_slave *spi, struct spi_flash *flash)
|
int spi_flash_probe_slave(struct spi_flash *flash)
|
||||||
{
|
{
|
||||||
|
struct spi_slave *spi = flash->spi;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
/* Setup spi_slave */
|
/* Setup spi_slave */
|
||||||
@ -41,7 +41,7 @@ int spi_flash_probe_slave(struct spi_slave *spi, struct spi_flash *flash)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = spi_flash_scan(spi, flash);
|
ret = spi_flash_scan(flash);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
ret = -EINVAL;
|
ret = -EINVAL;
|
||||||
goto err_read_id;
|
goto err_read_id;
|
||||||
@ -68,7 +68,8 @@ struct spi_flash *spi_flash_probe_tail(struct spi_slave *bus)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (spi_flash_probe_slave(bus, flash)) {
|
flash->spi = bus;
|
||||||
|
if (spi_flash_probe_slave(flash)) {
|
||||||
spi_free_slave(bus);
|
spi_free_slave(bus);
|
||||||
free(flash);
|
free(flash);
|
||||||
return NULL;
|
return NULL;
|
||||||
@ -152,8 +153,9 @@ int spi_flash_std_probe(struct udevice *dev)
|
|||||||
|
|
||||||
flash = dev_get_uclass_priv(dev);
|
flash = dev_get_uclass_priv(dev);
|
||||||
flash->dev = dev;
|
flash->dev = dev;
|
||||||
|
flash->spi = slave;
|
||||||
debug("%s: slave=%p, cs=%d\n", __func__, slave, plat->cs);
|
debug("%s: slave=%p, cs=%d\n", __func__, slave, plat->cs);
|
||||||
return spi_flash_probe_slave(slave, flash);
|
return spi_flash_probe_slave(flash);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct dm_spi_flash_ops spi_flash_std_ops = {
|
static const struct dm_spi_flash_ops spi_flash_std_ops = {
|
||||||
|
Loading…
Reference in New Issue
Block a user