target/linux/layerscape/patches-4.4/1109-drivers-mtd-spi-nor-Enable-QSPI-Flash-in-Kernel.patch

   1 From 70516f60de441829e7813c0b26567c8bda39c011 Mon Sep 17 00:00:00 2001
   2 From: Pratiyush Mohan Srivastava <pratiyush.srivastava@nxp.com>
   3 Date: Sun, 24 Apr 2016 23:20:26 +0530
   4 Subject: [PATCH 109/113] drivers: mtd: spi-nor: Enable QSPI Flash in Kernel
   5
   6 Enable read from QSPI flash, Write onto QSPI Flash and
   7 erase QSPI Flash in Fast mode in Kernel.
   8
   9 Signed-off-by: Pratiyush Mohan Srivastava <pratiyush.srivastava@nxp.com>
  10 Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
  11 ---
  12  drivers/mtd/spi-nor/spi-nor.c |    3 +++
  13  1 file changed, 3 insertions(+)
  14
  15 --- a/drivers/mtd/spi-nor/spi-nor.c
  16 +++ b/drivers/mtd/spi-nor/spi-nor.c
  17 @@ -798,6 +798,7 @@ static const struct flash_info spi_nor_i
  18         { "s25sl032p",  INFO(0x010215, 0x4d00,  64 * 1024,  64, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
  19         { "s25sl064p",  INFO(0x010216, 0x4d00,  64 * 1024, 128, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
  20         { "s25fs256s1", INFO6(0x010219, 0x4d0181, 64 * 1024, 512, 0)},
  21 +       { "s25fs512s",  INFO6(0x010220, 0x4d0081, 128 * 1024, 512, 0)},
  22         { "s25fl256s0", INFO(0x010219, 0x4d00, 256 * 1024, 128, 0) },
  23         { "s25fl256s1", INFO(0x010219, 0x4d01,  64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
  24         { "s25fl512s",  INFO(0x010220, 0x4d00, 256 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
  25 @@ -964,9 +965,11 @@ static int spansion_s25fs_disable_4kb_er
  26         ret = nor->read_reg(nor, SPINOR_OP_SPANSION_RDAR, &cr3v, 1);
  27         if (ret)
  28                 return ret;
  29 +/*
  30         if (!(cr3v & CR3V_4KB_ERASE_UNABLE))
  31                 return -EPERM;
  32
  33 +*/
  34         return 0;
  35  }
  36