mtd: spi-nor-core: Add the ->ready() hook

For dual/quad die package devices from Spansion/Cypress, the device's
status needs to be checked by reading status registers in all dies, by
using Read Any Register command. To support this, a Flash specific hook
that can overwrite the legacy status check is needed.

Signed-off-by: Takahiro Kuwano <Takahiro.Kuwano@infineon.com>
Reviewed-by: Pratyush Yadav <p.yadav@ti.com>
Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>

diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index 2b72d65b0ab9b22b24fa5479355748e31a341797..d953c7e44fea448b676a3380041b2e301e15a181 100644 (file)
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -713,7 +713,7 @@ static int spi_nor_fsr_ready(struct spi_nor *nor)
        return fsr & FSR_READY;
 }
 
-static int spi_nor_ready(struct spi_nor *nor)
+static int spi_nor_default_ready(struct spi_nor *nor)
 {
        int sr, fsr;
 
@@ -726,6 +726,14 @@ static int spi_nor_ready(struct spi_nor *nor)
        return sr && fsr;
 }
 
+static int spi_nor_ready(struct spi_nor *nor)
+{
+       if (nor->ready)
+               return nor->ready(nor);
+
+       return spi_nor_default_ready(nor);
+}
+
 /*
  * Service routine to read status register until ready, or timeout occurs.
  * Returns non-zero if error.

diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h
index 81df05fe841399028a9dfe66d5fa2c5c4d626480..e579ff2c7e59e45be92a13b82df5a8e69e7b6516 100644 (file)
--- a/include/linux/mtd/spi-nor.h
+++ b/include/linux/mtd/spi-nor.h
@@ -504,6 +504,7 @@ struct spi_flash {
  *                     completely locked
  * @quad_enable:       [FLASH-SPECIFIC] enables SPI NOR quad mode
  * @octal_dtr_enable:  [FLASH-SPECIFIC] enables SPI NOR octal DTR mode.
+ * @ready:             [FLASH-SPECIFIC] check if the flash is ready
  * @priv:              the private data
  */
 struct spi_nor {
@@ -552,6 +553,7 @@ struct spi_nor {
        int (*flash_is_locked)(struct spi_nor *nor, loff_t ofs, uint64_t len);
        int (*quad_enable)(struct spi_nor *nor);
        int (*octal_dtr_enable)(struct spi_nor *nor);
+       int (*ready)(struct spi_nor *nor);
 
        void *priv;
 /* Compatibility for spi_flash, remove once sf layer is merged with mtd */