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

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

Browse source 
s28hx_t_post_bfpt_fixup() fixes erase opcode, erase size, and page size.
s25_post_bfpt_fixup() is doing same thing including multi-die support.
We can consolidate s28hx_t_post_bfpt_fixup() and s25_post_bfpt_fixup()
into one named s25_s28_post_bfpt_fixup().

In s25_s28_post_bfpt_fixup(), set_4byte() is called to force the device to
be 4-byte addressing mode. In S28HS02GT datasheet, the B7 opcode is missing
but it works actually (confirmed).

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:04 +09:00 • committed by Jagan Teki
parent 33934e11d4
commit d386fa8b0d
1 changed files with 6 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3456,10 +3456,10 @@ static void s25_default_init(struct spi_nor *nor)
nor->setup = s25_s28_setup; nor->setup = s25_s28_setup;
} }
static int s25_post_bfpt_fixup(struct spi_nor *nor, static int s25_s28_post_bfpt_fixup(struct spi_nor *nor,
const struct sfdp_parameter_header *header, const struct sfdp_parameter_header *header,
const struct sfdp_bfpt *bfpt, const struct sfdp_bfpt *bfpt,
struct spi_nor_flash_parameter *params) struct spi_nor_flash_parameter *params)
{ {
int ret; int ret;
u32 addr; u32 addr;
@ -3533,7 +3533,7 @@ static void s25_post_sfdp_fixup(struct spi_nor *nor,
static struct spi_nor_fixups s25_fixups = { static struct spi_nor_fixups s25_fixups = {
.default_init = s25_default_init, .default_init = s25_default_init,
.post_bfpt = s25_post_bfpt_fixup, .post_bfpt = s25_s28_post_bfpt_fixup,
.post_sfdp = s25_post_sfdp_fixup, .post_sfdp = s25_post_sfdp_fixup,
}; };
@ -3649,50 +3649,10 @@ static void s28hx_t_post_sfdp_fixup(struct spi_nor *nor,
params->rdsr_addr_nbytes = 4; params->rdsr_addr_nbytes = 4;
} }
static int s28hx_t_post_bfpt_fixup(struct spi_nor *nor,
const struct sfdp_parameter_header *bfpt_header,
const struct sfdp_bfpt *bfpt,
struct spi_nor_flash_parameter *params)
{
struct spi_mem_op op;
u8 buf;
u8 addr_width = 3;
int ret;
/*
* The BFPT table advertises a 512B page size but the page size is
* actually configurable (with the default being 256B). Read from
* CFR3V[4] and set the correct size.
*/
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_PGSZ)
params->page_size = 512;
else
params->page_size = 256;
/*
* The BFPT advertises that it supports 4k erases, and the datasheet
* says the same. But 4k erases did not work when testing. So, use 256k
* erases for now.
*/
nor->erase_opcode = SPINOR_OP_SE_4B;
nor->mtd.erasesize = 0x40000;
return 0;
}
static struct spi_nor_fixups s28hx_t_fixups = { static struct spi_nor_fixups s28hx_t_fixups = {
.default_init = s28hx_t_default_init, .default_init = s28hx_t_default_init,
.post_sfdp = s28hx_t_post_sfdp_fixup, .post_sfdp = s28hx_t_post_sfdp_fixup,
.post_bfpt = s28hx_t_post_bfpt_fixup, .post_bfpt = s25_s28_post_bfpt_fixup,
}; };
#endif /* CONFIG_SPI_FLASH_S28HX_T */ #endif /* CONFIG_SPI_FLASH_S28HX_T */