diff options
| author | Boris Brezillon <boris.brezillon@free-electrons.com> | 2018-01-29 09:55:14 +0100 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@free-electrons.com> | 2018-01-29 09:55:14 +0100 |
| commit | c8f22b02a8bbc74525d17dd37d39bdf599e68a79 (patch) | |
| tree | b1f5b65b7d5c6c37bddd517f203fef59fe79e375 /drivers/mtd/devices | |
| parent | 0aede42e98e0dfc64534617332b6a120cfcfe850 (diff) | |
| parent | 23bae78e8a57f0249ed9e3f9c3f40fc1499ce0d4 (diff) | |
| download | linux-stable-c8f22b02a8bbc74525d17dd37d39bdf599e68a79.tar.gz linux-stable-c8f22b02a8bbc74525d17dd37d39bdf599e68a79.tar.bz2 linux-stable-c8f22b02a8bbc74525d17dd37d39bdf599e68a79.zip | |
Merge tag 'spi-nor/for-4.16' of git://git.infradead.org/linux-mtd into mtd/next
Pull spi-nor changes from Cyrille Pitchen:
"
This pull-request contains the following notable changes:
Core changes:
* Add support to new ISSI and Cypress/Spansion memory parts.
* Fix support of Micron memories by checking error bits in the FSR.
* Fix update of block-protection bits by reading back the SR.
* Restore the internal state of the SPI flash memory when removing the
device.
Driver changes:
* Maintenance for Freescale, Intel and Metiatek drivers.
* Add support of the direct access mode for the Cadence QSPI controller.
"
Diffstat (limited to 'drivers/mtd/devices')
| -rw-r--r-- | drivers/mtd/devices/m25p80.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index dbe6a1de2bb8..a4e18f6aaa33 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -307,10 +307,18 @@ static int m25p_remove(struct spi_device *spi) { struct m25p *flash = spi_get_drvdata(spi); + spi_nor_restore(&flash->spi_nor); + /* Clean up MTD stuff. */ return mtd_device_unregister(&flash->spi_nor.mtd); } +static void m25p_shutdown(struct spi_device *spi) +{ + struct m25p *flash = spi_get_drvdata(spi); + + spi_nor_restore(&flash->spi_nor); +} /* * Do NOT add to this array without reading the following: * @@ -386,6 +394,7 @@ static struct spi_driver m25p80_driver = { .id_table = m25p_ids, .probe = m25p_probe, .remove = m25p_remove, + .shutdown = m25p_shutdown, /* REVISIT: many of these chips have deep power-down modes, which * should clearly be entered on suspend() to minimize power use. |