mtd: spi-nor: manufacturers: Use spi_nor_read_id() core method
Use spi_nor_read_id() core method to avoid duplication of code. Now the ID is read on the full SPI_NOR_MAX_ID_LEN instead of round_up(nor->info->id_len, 2), but it doesn't harm to read more ID bytes, so the change comes with no secondary effects. dev_dbg messages in case spi_nor_read_id() fails, will be added in a further patch after we split the octal DTR enable/disable methods. Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com> Signed-off-by: Pratyush Yadav <p.yadav@ti.com> Reviewed-by: Pratyush Yadav <p.yadav@ti.com> Reviewed-by: Michael Walle <michael@walle.cc> Link: https://lore.kernel.org/r/20220420103427.47867-6-tudor.ambarus@microchip.com
This commit is contained in:
Родитель
86b6b55ffb
Коммит
a007d81aa5
|
@ -91,17 +91,10 @@ static int micron_st_nor_octal_dtr_enable(struct spi_nor *nor, bool enable)
|
|||
return ret;
|
||||
|
||||
/* Read flash ID to make sure the switch was successful. */
|
||||
op = (struct spi_mem_op)
|
||||
SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_RDID, 1),
|
||||
SPI_MEM_OP_NO_ADDR,
|
||||
SPI_MEM_OP_DUMMY(enable ? 8 : 0, 1),
|
||||
SPI_MEM_OP_DATA_IN(round_up(nor->info->id_len, 2),
|
||||
buf, 1));
|
||||
|
||||
if (enable)
|
||||
spi_nor_spimem_setup_op(nor, &op, SNOR_PROTO_8_8_8_DTR);
|
||||
|
||||
ret = spi_mem_exec_op(nor->spimem, &op);
|
||||
ret = spi_nor_read_id(nor, 0, 8, buf, SNOR_PROTO_8_8_8_DTR);
|
||||
else
|
||||
ret = spi_nor_read_id(nor, 0, 0, buf, SNOR_PROTO_1_1_1);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
|
|
|
@ -98,17 +98,10 @@ static int cypress_nor_octal_dtr_enable(struct spi_nor *nor, bool enable)
|
|||
return ret;
|
||||
|
||||
/* Read flash ID to make sure the switch was successful. */
|
||||
op = (struct spi_mem_op)
|
||||
SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_RDID, 1),
|
||||
SPI_MEM_OP_ADDR(enable ? 4 : 0, 0, 1),
|
||||
SPI_MEM_OP_DUMMY(enable ? 3 : 0, 1),
|
||||
SPI_MEM_OP_DATA_IN(round_up(nor->info->id_len, 2),
|
||||
buf, 1));
|
||||
|
||||
if (enable)
|
||||
spi_nor_spimem_setup_op(nor, &op, SNOR_PROTO_8_8_8_DTR);
|
||||
|
||||
ret = spi_mem_exec_op(nor->spimem, &op);
|
||||
ret = spi_nor_read_id(nor, 4, 3, buf, SNOR_PROTO_8_8_8_DTR);
|
||||
else
|
||||
ret = spi_nor_read_id(nor, 0, 0, buf, SNOR_PROTO_1_1_1);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче