generic: mtd: backport SPI_NOR_HAS_LOCK

[openwrt/openwrt.git] / target / linux / layerscape / patches-4.4 / 1090-mtd-spi-nor-Add-SPI-NOR-layer-PM-support.patch

diff --git a/target/linux/layerscape/patches-4.4/1090-mtd-spi-nor-Add-SPI-NOR-layer-PM-support.patch b/target/linux/layerscape/patches-4.4/1090-mtd-spi-nor-Add-SPI-NOR-layer-PM-support.patch
index 10be8072fcd3fc3f1d3b2f4abd7aa2ff6ffa630d..65a66334535385b33f7f4f92ff6e771e6e618bc2 100644 (file)
--- a/target/linux/layerscape/patches-4.4/1090-mtd-spi-nor-Add-SPI-NOR-layer-PM-support.patch
+++ b/target/linux/layerscape/patches-4.4/1090-mtd-spi-nor-Add-SPI-NOR-layer-PM-support.patch
@@ -24,7 +24,7 @@ Integrated-by: Jiang Yutang <yutang.jiang@nxp.com>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c

-@@ -1140,6 +1140,26 @@ static int spi_nor_check(struct spi_nor
+@@ -1141,6 +1141,26 @@ static int spi_nor_check(struct spi_nor

        return 0;
  }
  
        return 0;
  }
  


@@ -51,7 +51,7 @@ Integrated-by: Jiang Yutang <yutang.jiang@nxp.com>
  int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode)
  {
        const struct flash_info *info = NULL;
  int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode)
  {
        const struct flash_info *info = NULL;

-@@ -1187,18 +1207,9 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1188,19 +1208,9 @@ int spi_nor_scan(struct spi_nor *nor, co

  
        mutex_init(&nor->lock);
  
  
        mutex_init(&nor->lock);
  


@@ -63,7 +63,8 @@ Integrated-by: Jiang Yutang <yutang.jiang@nxp.com>
 -      if (JEDEC_MFR(info) == SNOR_MFR_ATMEL ||
 -          JEDEC_MFR(info) == SNOR_MFR_INTEL ||
 -          JEDEC_MFR(info) == SNOR_MFR_MACRONIX ||
 -      if (JEDEC_MFR(info) == SNOR_MFR_ATMEL ||
 -          JEDEC_MFR(info) == SNOR_MFR_INTEL ||
 -          JEDEC_MFR(info) == SNOR_MFR_MACRONIX ||

--          JEDEC_MFR(info) == SNOR_MFR_SST) {
+-          JEDEC_MFR(info) == SNOR_MFR_SST ||
+-          info->flags & SPI_NOR_HAS_LOCK) {

 -              write_enable(nor);
 -              write_sr(nor, 0);
 -      }
 -              write_enable(nor);
 -              write_sr(nor, 0);
 -      }


@@ -73,7 +74,7 @@ Integrated-by: Jiang Yutang <yutang.jiang@nxp.com>
  
        if (!mtd->name)
                mtd->name = dev_name(dev);
  
        if (!mtd->name)
                mtd->name = dev_name(dev);

-@@ -1364,6 +1375,45 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1367,6 +1377,45 @@ int spi_nor_scan(struct spi_nor *nor, co

  }
  EXPORT_SYMBOL_GPL(spi_nor_scan);
  
  }
  EXPORT_SYMBOL_GPL(spi_nor_scan);