mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-07-23 03:19:43 +09:00
sf: probe: Code cleanup
- Move bar read code below the bar write hance both at once place, hence it easy for #ifdef macro only once and readable. - Move read_cmd_array at top Tested-by: Jagan Teki <jteki@openedev.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
1e90d9fd31
commit
0edae52f08
@ -30,6 +30,16 @@ static void spi_flash_addr(u32 addr, u8 *cmd)
|
|||||||
cmd[3] = addr >> 0;
|
cmd[3] = addr >> 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Read commands array */
|
||||||
|
static u8 spi_read_cmds_array[] = {
|
||||||
|
CMD_READ_ARRAY_SLOW,
|
||||||
|
CMD_READ_ARRAY_FAST,
|
||||||
|
CMD_READ_DUAL_OUTPUT_FAST,
|
||||||
|
CMD_READ_DUAL_IO_FAST,
|
||||||
|
CMD_READ_QUAD_OUTPUT_FAST,
|
||||||
|
CMD_READ_QUAD_IO_FAST,
|
||||||
|
};
|
||||||
|
|
||||||
int spi_flash_cmd_read_status(struct spi_flash *flash, u8 *rs)
|
int spi_flash_cmd_read_status(struct spi_flash *flash, u8 *rs)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
@ -133,6 +143,35 @@ bar_end:
|
|||||||
flash->bank_curr = bank_sel;
|
flash->bank_curr = bank_sel;
|
||||||
return flash->bank_curr;
|
return flash->bank_curr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int spi_flash_read_bank(struct spi_flash *flash, u8 idcode0)
|
||||||
|
{
|
||||||
|
u8 curr_bank = 0;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
if (flash->size <= SPI_FLASH_16MB_BOUN)
|
||||||
|
goto bank_end;
|
||||||
|
|
||||||
|
switch (idcode0) {
|
||||||
|
case SPI_FLASH_CFI_MFR_SPANSION:
|
||||||
|
flash->bank_read_cmd = CMD_BANKADDR_BRRD;
|
||||||
|
flash->bank_write_cmd = CMD_BANKADDR_BRWR;
|
||||||
|
default:
|
||||||
|
flash->bank_read_cmd = CMD_EXTNADDR_RDEAR;
|
||||||
|
flash->bank_write_cmd = CMD_EXTNADDR_WREAR;
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = spi_flash_read_common(flash, &flash->bank_read_cmd, 1,
|
||||||
|
&curr_bank, 1);
|
||||||
|
if (ret) {
|
||||||
|
debug("SF: fail to read bank addr register\n");
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
bank_end:
|
||||||
|
flash->bank_curr = curr_bank;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_SF_DUAL_FLASH
|
#ifdef CONFIG_SF_DUAL_FLASH
|
||||||
@ -762,16 +801,6 @@ int stm_unlock(struct spi_flash *flash, u32 ofs, size_t len)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/* Read commands array */
|
|
||||||
static u8 spi_read_cmds_array[] = {
|
|
||||||
CMD_READ_ARRAY_SLOW,
|
|
||||||
CMD_READ_ARRAY_FAST,
|
|
||||||
CMD_READ_DUAL_OUTPUT_FAST,
|
|
||||||
CMD_READ_DUAL_IO_FAST,
|
|
||||||
CMD_READ_QUAD_OUTPUT_FAST,
|
|
||||||
CMD_READ_QUAD_IO_FAST,
|
|
||||||
};
|
|
||||||
|
|
||||||
#ifdef CONFIG_SPI_FLASH_MACRONIX
|
#ifdef CONFIG_SPI_FLASH_MACRONIX
|
||||||
static int spi_flash_set_qeb_mxic(struct spi_flash *flash)
|
static int spi_flash_set_qeb_mxic(struct spi_flash *flash)
|
||||||
{
|
{
|
||||||
@ -839,37 +868,6 @@ static int spi_flash_set_qeb(struct spi_flash *flash, u8 idcode0)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_SPI_FLASH_BAR
|
|
||||||
static int spi_flash_read_bank(struct spi_flash *flash, u8 idcode0)
|
|
||||||
{
|
|
||||||
u8 curr_bank = 0;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
if (flash->size <= SPI_FLASH_16MB_BOUN)
|
|
||||||
goto bank_end;
|
|
||||||
|
|
||||||
switch (idcode0) {
|
|
||||||
case SPI_FLASH_CFI_MFR_SPANSION:
|
|
||||||
flash->bank_read_cmd = CMD_BANKADDR_BRRD;
|
|
||||||
flash->bank_write_cmd = CMD_BANKADDR_BRWR;
|
|
||||||
default:
|
|
||||||
flash->bank_read_cmd = CMD_EXTNADDR_RDEAR;
|
|
||||||
flash->bank_write_cmd = CMD_EXTNADDR_WREAR;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = spi_flash_read_common(flash, &flash->bank_read_cmd, 1,
|
|
||||||
&curr_bank, 1);
|
|
||||||
if (ret) {
|
|
||||||
debug("SF: fail to read bank addr register\n");
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
bank_end:
|
|
||||||
flash->bank_curr = curr_bank;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if CONFIG_IS_ENABLED(OF_CONTROL)
|
#if CONFIG_IS_ENABLED(OF_CONTROL)
|
||||||
int spi_flash_decode_fdt(const void *blob, struct spi_flash *flash)
|
int spi_flash_decode_fdt(const void *blob, struct spi_flash *flash)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user