leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mtd: spi-nor: Mask out fast read if not requested in DT

Browse Source 
The DT bindings of "jedec,spi-nor" [1] defines "m25p,fast-read" property
to indicate that "fast read" opcode can be used to read data from the
chip instead of the usual "read" opcode.

If this property is not present in DT, mask out fast read in
spi_nor_init_params(). This change mirrors the same logic in
spi_nor_info_init_params() in drivers/mtd/spi-nor/core.c in
the Linux kernel v5.14-rc3.

[1] Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml in the kernel tree

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
This commit is contained in:
Bin Meng 2021-07-30 15:20:17 +08:00 committed by Jagan Teki
parent 87e7219f9c
commit d008190920
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/mtd/spi/spi-nor-core.c
View File

@ -2604,18 +2604,28 @@ static int spi_nor_init_params(struct spi_nor *nor,
params->size = info->sector_size * info->n_sectors; params->size = info->sector_size * info->n_sectors;
params->page_size = info->page_size; params->page_size = info->page_size;
if (!(info->flags & SPI_NOR_NO_FR)) {
/* Default to Fast Read for DT and non-DT platform devices. */
params->hwcaps.mask |= SNOR_HWCAPS_READ_FAST;
/* Mask out Fast Read if not requested at DT instantiation. */
#if CONFIG_IS_ENABLED(DM_SPI)
if (!ofnode_read_bool(dev_ofnode(nor->spi->dev),
"m25p,fast-read"))
params->hwcaps.mask &= ~SNOR_HWCAPS_READ_FAST;
#endif
}
/* (Fast) Read settings. */ /* (Fast) Read settings. */
params->hwcaps.mask |= SNOR_HWCAPS_READ; params->hwcaps.mask |= SNOR_HWCAPS_READ;
spi_nor_set_read_settings(&params->reads[SNOR_CMD_READ], spi_nor_set_read_settings(&params->reads[SNOR_CMD_READ],
0, 0, SPINOR_OP_READ, 0, 0, SPINOR_OP_READ,
SNOR_PROTO_1_1_1); SNOR_PROTO_1_1_1);
if (!(info->flags & SPI_NOR_NO_FR)) { if (params->hwcaps.mask & SNOR_HWCAPS_READ_FAST)
params->hwcaps.mask |= SNOR_HWCAPS_READ_FAST;
spi_nor_set_read_settings(&params->reads[SNOR_CMD_READ_FAST], spi_nor_set_read_settings(&params->reads[SNOR_CMD_READ_FAST],
0, 8, SPINOR_OP_READ_FAST, 0, 8, SPINOR_OP_READ_FAST,
SNOR_PROTO_1_1_1); SNOR_PROTO_1_1_1);
}
if (info->flags & SPI_NOR_DUAL_READ) { if (info->flags & SPI_NOR_DUAL_READ) {
params->hwcaps.mask |= SNOR_HWCAPS_READ_1_1_2; params->hwcaps.mask |= SNOR_HWCAPS_READ_1_1_2;