From: Takahiro Kuwano <takahiro.kuw...@infineon.com>

s25_mdp_ready() handles status polling for multi-die package parts that
requires to read and check status register for each die. To support
S28HS02GT(dual-die package with Octal DTR support), rename function and
use nor->rdsr_dummy in octal DTR mode.

Signed-off-by: Takahiro Kuwano <takahiro.kuw...@infineon.com>
---
 drivers/mtd/spi/spi-nor-core.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index 0e4498d6f59e..3e347a3be38b 100644
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -3223,13 +3223,13 @@ static int spi_nor_setup(struct spi_nor *nor, const 
struct flash_info *info,
 /* Use ID byte 4 to distinguish S25FS256T and S25Hx-T */
 #define S25FS256T_ID4  (0x08)
 
-static int s25_mdp_ready(struct spi_nor *nor)
+static int s25_s28_mdp_ready(struct spi_nor *nor)
 {
        u32 addr;
        int ret;
 
        for (addr = 0; addr < nor->mtd.size; addr += SZ_128M) {
-               ret = spansion_sr_ready(nor, addr, 0);
+               ret = spansion_sr_ready(nor, addr, nor->rdsr_dummy);
                if (!ret)
                        return ret;
        }
@@ -3299,7 +3299,7 @@ static int s25_setup(struct spi_nor *nor, const struct 
flash_info *info,
         * all dies' status via read any register.
         */
        if (nor->mtd.size > SZ_128M)
-               nor->ready = s25_mdp_ready;
+               nor->ready = s25_s28_mdp_ready;
 
        return spi_nor_default_setup(nor, info, params);
 }
-- 
2.25.1

Reply via email to