package/boot/uboot-layerscape/patches/0010-driver-mtd-spi-Adding-support-for-QSPI-flash.patch

   1 From 27d1d5620ae352d230189fbea364198398065ae2 Mon Sep 17 00:00:00 2001
   2 From: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
   3 Date: Mon, 25 Apr 2016 16:06:48 +0530
   4 Subject: [PATCH 10/93] driver: mtd: spi: Adding support for QSPI flash
   5
   6 Serial number and vendor id are added for QSPI flash
   7 common on both LS1012AQDS and LS1012ARDB.
   8
   9 Signed-off-by: Pratiyush Mohan Srivastava <pratiyush.srivastava@nxp.com>
  10 Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
  11 Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
  12 ---
  13  drivers/mtd/spi/sf_params.c |    1 +
  14  drivers/mtd/spi/spi_flash.c |    3 ++-
  15  2 files changed, 3 insertions(+), 1 deletion(-)
  16
  17 diff --git a/drivers/mtd/spi/sf_params.c b/drivers/mtd/spi/sf_params.c
  18 index 1424f2a..1afb8b3 100644
  19 --- a/drivers/mtd/spi/sf_params.c
  20 +++ b/drivers/mtd/spi/sf_params.c
  21 @@ -68,6 +68,7 @@ const struct spi_flash_params spi_flash_params_table[] = {
  22         {"S25FL256S_256K", 0x010219, 0x4d00,   256 * 1024,   128, RD_FULL,                   WR_QPP},
  23         {"S25FL256S_64K",  0x010219, 0x4d01,    64 * 1024,   512, RD_FULL,                   WR_QPP},
  24         {"S25FS512S",      0x010220, 0x0102,    256 * 1024,  256, RD_FULL,              WR_QPP},
  25 +       {"S25FS512S_256K", 0x010220, 0x4D00,    128 * 1024,  512, RD_FULL,              WR_QPP},
  26         {"S25FL512S_256K", 0x010220, 0x4d00,   256 * 1024,   256, RD_FULL,                   WR_QPP},
  27         {"S25FL512S_64K",  0x010220, 0x4d01,    64 * 1024,  1024, RD_FULL,                   WR_QPP},
  28         {"S25FL512S_512K", 0x010220, 0x4f00,   256 * 1024,   256, RD_FULL,                   WR_QPP},
  29 diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c
  30 index 2d23aee..865e929 100644
  31 --- a/drivers/mtd/spi/spi_flash.c
  32 +++ b/drivers/mtd/spi/spi_flash.c
  33 @@ -1033,7 +1033,8 @@ int spi_flash_scan(struct spi_flash *flash)
  34          * sector that is not overlaid by the parameter sectors.
  35          * The uniform sector erase command has no effect on parameter sectors.
  36          */
  37 -       if (jedec == 0x0219 && (ext_jedec & 0xff00) == 0x4d00) {
  38 +       if ((jedec == 0x0219 || (jedec == 0x0220)) &&
  39 +           (ext_jedec & 0xff00) == 0x4d00) {
  40                 int ret;
  41                 u8 id[6];
  42
  43 --
  44 1.7.9.5
  45