From: Kamal Dasu Date: Tue, 22 Aug 2017 20:45:22 +0000 (-0400) Subject: mtd: spi-nor: Add spi-nor mtd resume handler X-Git-Tag: v4.15-rc1~25^2~15^2~32 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6084fc83c8249779a6b7a1d48830f1f3fc120fe;p=thirdparty%2Flinux.git mtd: spi-nor: Add spi-nor mtd resume handler Implemented and populated spi-nor mtd PM handlers for resume ops. spi-nor resume op re-initializes spi-nor flash to its probed state by calling the newly implemented spi_nor_init() function. Signed-off-by: Kamal Dasu Signed-off-by: Cyrille Pitchen --- diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index 04751a73c3fe6..61fdd3c1a2bc1 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -2670,6 +2670,19 @@ static int spi_nor_init(struct spi_nor *nor) return 0; } +/* mtd resume handler */ +static void spi_nor_resume(struct mtd_info *mtd) +{ + struct spi_nor *nor = mtd_to_spi_nor(mtd); + struct device *dev = nor->dev; + int ret; + + /* re-initialize the nor chip */ + ret = spi_nor_init(nor); + if (ret) + dev_err(dev, "resume() failed\n"); +} + int spi_nor_scan(struct spi_nor *nor, const char *name, const struct spi_nor_hwcaps *hwcaps) { @@ -2746,6 +2759,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, mtd->size = params.size; mtd->_erase = spi_nor_erase; mtd->_read = spi_nor_read; + mtd->_resume = spi_nor_resume; /* NOR protection support for STmicro/Micron chips and similar */ if (JEDEC_MFR(info) == SNOR_MFR_MICRON ||