Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-26 12:27:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

mtd: spi-nor-core: Consolidate setup() hook for Infineon(Cypress) S25 and S28

Browse source 
s28hx_t_setup() only checks sector layout setting. To support multi-die
package parts like S28HS02GT, it needs to check device size and assign
ready() hook for multi-die package parts. These are covered in s25_setup()
so we can consolidate s28hx_t_setup() and s25_setup() into one named
s25_s28_setup().

spi_nor_wait_till_ready() at the beginning of s28hx_t_setup() can be
removed since there is no op that makes device busy state before setup.

Signed-off-by: Takahiro Kuwano <Takahiro.Kuwano@infineon.com>
Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
This commit is contained in:
Takahiro Kuwano 2023-12-22 14:46:03 +09:00 • committed by Jagan Teki
parent c4de92d949
commit 33934e11d4
1 changed files with 4 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
drivers/mtd/spi/spi-nor-core.c
View file

@ -3405,8 +3405,8 @@ static int s25_s28_erase_non_uniform(struct spi_nor *nor, loff_t addr)
SZ_128K); SZ_128K);
} }
static int s25_setup(struct spi_nor *nor, const struct flash_info *info, static int s25_s28_setup(struct spi_nor *nor, const struct flash_info *info,
const struct spi_nor_flash_parameter *params) const struct spi_nor_flash_parameter *params)
{ {
int ret; int ret;
u8 cr; u8 cr;
@ -3453,7 +3453,7 @@ static int s25_setup(struct spi_nor *nor, const struct flash_info *info,
static void s25_default_init(struct spi_nor *nor) static void s25_default_init(struct spi_nor *nor)
{ {
nor->setup = s25_setup; nor->setup = s25_s28_setup;
} }
static int s25_post_bfpt_fixup(struct spi_nor *nor, static int s25_post_bfpt_fixup(struct spi_nor *nor,
@ -3612,43 +3612,10 @@ static int spi_nor_cypress_octal_dtr_enable(struct spi_nor *nor)
return 0; return 0;
} }
static int s28hx_t_setup(struct spi_nor *nor, const struct flash_info *info,
const struct spi_nor_flash_parameter *params)
{
struct spi_mem_op op;
u8 buf;
u8 addr_width = 3;
int ret;
ret = spi_nor_wait_till_ready(nor);
if (ret)
return ret;
/*
* Check CFR3V to check if non-uniform sector mode is selected. If it
* is, set the erase hook to the non-uniform erase procedure.
*/
op = (struct spi_mem_op)
SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_RD_ANY_REG, 1),
SPI_MEM_OP_ADDR(addr_width,
SPINOR_REG_CYPRESS_CFR3V, 1),
SPI_MEM_OP_NO_DUMMY,
SPI_MEM_OP_DATA_IN(1, &buf, 1));
ret = spi_mem_exec_op(nor->spi, &op);
if (ret)
return ret;
if (!(buf & SPINOR_REG_CYPRESS_CFR3_UNISECT))
nor->erase = s25_s28_erase_non_uniform;
return spi_nor_default_setup(nor, info, params);
}
static void s28hx_t_default_init(struct spi_nor *nor) static void s28hx_t_default_init(struct spi_nor *nor)
{ {
nor->octal_dtr_enable = spi_nor_cypress_octal_dtr_enable; nor->octal_dtr_enable = spi_nor_cypress_octal_dtr_enable;
nor->setup = s28hx_t_setup; nor->setup = s25_s28_setup;
} }
static void s28hx_t_post_sfdp_fixup(struct spi_nor *nor, static void s28hx_t_post_sfdp_fixup(struct spi_nor *nor,