diff for duplicates of <20200916124418.833-8-p.yadav@ti.com> diff --git a/a/1.txt b/N1/1.txt index 7ecef29..8b13789 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,39 +1 @@ -The xSPI Profile 1.0 table specifies how many dummy cycles and address -bytes are needed for the Read Status Register command in octal DTR mode. -Use that information to send the correct Read SR command. -Signed-off-by: Pratyush Yadav <p.yadav@ti.com> ---- - drivers/mtd/spi-nor/core.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c -index cbb1aab27d03..88c9e18067f4 100644 ---- a/drivers/mtd/spi-nor/core.c -+++ b/drivers/mtd/spi-nor/core.c -@@ -383,6 +383,11 @@ static int spi_nor_read_sr(struct spi_nor *nor, u8 *sr) - SPI_MEM_OP_NO_DUMMY, - SPI_MEM_OP_DATA_IN(1, sr, 1)); - -+ if (spi_nor_protocol_is_dtr(nor->reg_proto)) { -+ op.addr.nbytes = nor->params->rdsr_addr_nbytes; -+ op.dummy.nbytes = nor->params->rdsr_dummy; -+ } -+ - spi_nor_spimem_setup_op(nor, &op, nor->reg_proto); - - ret = spi_mem_exec_op(nor->spimem, &op); -@@ -415,6 +420,11 @@ static int spi_nor_read_fsr(struct spi_nor *nor, u8 *fsr) - SPI_MEM_OP_NO_DUMMY, - SPI_MEM_OP_DATA_IN(1, fsr, 1)); - -+ if (spi_nor_protocol_is_dtr(nor->reg_proto)) { -+ op.addr.nbytes = nor->params->rdsr_addr_nbytes; -+ op.dummy.nbytes = nor->params->rdsr_dummy; -+ } -+ - spi_nor_spimem_setup_op(nor, &op, nor->reg_proto); - - ret = spi_mem_exec_op(nor->spimem, &op); --- -2.28.0 diff --git a/a/content_digest b/N1/content_digest index 08f91bc..4dea92b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -13,44 +13,5 @@ " Boris Brezillon <boris.brezillon@collabora.com>\0" "\00:1\0" "b\0" - "The xSPI Profile 1.0 table specifies how many dummy cycles and address\n" - "bytes are needed for the Read Status Register command in octal DTR mode.\n" - "Use that information to send the correct Read SR command.\n" - "\n" - "Signed-off-by: Pratyush Yadav <p.yadav@ti.com>\n" - "---\n" - " drivers/mtd/spi-nor/core.c | 10 ++++++++++\n" - " 1 file changed, 10 insertions(+)\n" - "\n" - "diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c\n" - "index cbb1aab27d03..88c9e18067f4 100644\n" - "--- a/drivers/mtd/spi-nor/core.c\n" - "+++ b/drivers/mtd/spi-nor/core.c\n" - "@@ -383,6 +383,11 @@ static int spi_nor_read_sr(struct spi_nor *nor, u8 *sr)\n" - " \t\t\t\t SPI_MEM_OP_NO_DUMMY,\n" - " \t\t\t\t SPI_MEM_OP_DATA_IN(1, sr, 1));\n" - " \n" - "+\t\tif (spi_nor_protocol_is_dtr(nor->reg_proto)) {\n" - "+\t\t\top.addr.nbytes = nor->params->rdsr_addr_nbytes;\n" - "+\t\t\top.dummy.nbytes = nor->params->rdsr_dummy;\n" - "+\t\t}\n" - "+\n" - " \t\tspi_nor_spimem_setup_op(nor, &op, nor->reg_proto);\n" - " \n" - " \t\tret = spi_mem_exec_op(nor->spimem, &op);\n" - "@@ -415,6 +420,11 @@ static int spi_nor_read_fsr(struct spi_nor *nor, u8 *fsr)\n" - " \t\t\t\t SPI_MEM_OP_NO_DUMMY,\n" - " \t\t\t\t SPI_MEM_OP_DATA_IN(1, fsr, 1));\n" - " \n" - "+\t\tif (spi_nor_protocol_is_dtr(nor->reg_proto)) {\n" - "+\t\t\top.addr.nbytes = nor->params->rdsr_addr_nbytes;\n" - "+\t\t\top.dummy.nbytes = nor->params->rdsr_dummy;\n" - "+\t\t}\n" - "+\n" - " \t\tspi_nor_spimem_setup_op(nor, &op, nor->reg_proto);\n" - " \n" - " \t\tret = spi_mem_exec_op(nor->spimem, &op);\n" - "-- \n" - 2.28.0 -66eba0e33e39e784cb0f93b05f09a18cb107d8d3c6470d1abea65f2e133d05e8 +a148ffecc18311ec53435e10408a59e8e9873b8dc59971dd9764c21dab620168
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox