layerscape: uboot-layerscape: prefer github over git.freescale.com
[openwrt/staging/yousong.git] / package / boot / uboot-layerscape / patches / 0010-driver-mtd-spi-Adding-support-for-QSPI-flash.patch
diff --git a/package/boot/uboot-layerscape/patches/0010-driver-mtd-spi-Adding-support-for-QSPI-flash.patch b/package/boot/uboot-layerscape/patches/0010-driver-mtd-spi-Adding-support-for-QSPI-flash.patch
deleted file mode 100644 (file)
index 01ace8f..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-From 27d1d5620ae352d230189fbea364198398065ae2 Mon Sep 17 00:00:00 2001
-From: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
-Date: Mon, 25 Apr 2016 16:06:48 +0530
-Subject: [PATCH 10/93] driver: mtd: spi: Adding support for QSPI flash
-
-Serial number and vendor id are added for QSPI flash
-common on both LS1012AQDS and LS1012ARDB.
-
-Signed-off-by: Pratiyush Mohan Srivastava <pratiyush.srivastava@nxp.com>
-Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
-Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
----
- drivers/mtd/spi/sf_params.c |    1 +
- drivers/mtd/spi/spi_flash.c |    3 ++-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/mtd/spi/sf_params.c b/drivers/mtd/spi/sf_params.c
-index 1424f2a..1afb8b3 100644
---- a/drivers/mtd/spi/sf_params.c
-+++ b/drivers/mtd/spi/sf_params.c
-@@ -68,6 +68,7 @@ const struct spi_flash_params spi_flash_params_table[] = {
-       {"S25FL256S_256K", 0x010219, 0x4d00,   256 * 1024,   128, RD_FULL,                   WR_QPP},
-       {"S25FL256S_64K",  0x010219, 0x4d01,    64 * 1024,   512, RD_FULL,                   WR_QPP},
-       {"S25FS512S",      0x010220, 0x0102,    256 * 1024,  256, RD_FULL,              WR_QPP},
-+      {"S25FS512S_256K", 0x010220, 0x4D00,    128 * 1024,  512, RD_FULL,              WR_QPP},
-       {"S25FL512S_256K", 0x010220, 0x4d00,   256 * 1024,   256, RD_FULL,                   WR_QPP},
-       {"S25FL512S_64K",  0x010220, 0x4d01,    64 * 1024,  1024, RD_FULL,                   WR_QPP},
-       {"S25FL512S_512K", 0x010220, 0x4f00,   256 * 1024,   256, RD_FULL,                   WR_QPP},
-diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c
-index 2d23aee..865e929 100644
---- a/drivers/mtd/spi/spi_flash.c
-+++ b/drivers/mtd/spi/spi_flash.c
-@@ -1033,7 +1033,8 @@ int spi_flash_scan(struct spi_flash *flash)
-        * sector that is not overlaid by the parameter sectors.
-        * The uniform sector erase command has no effect on parameter sectors.
-        */
--      if (jedec == 0x0219 && (ext_jedec & 0xff00) == 0x4d00) {
-+      if ((jedec == 0x0219 || (jedec == 0x0220)) &&
-+          (ext_jedec & 0xff00) == 0x4d00) {
-               int ret;
-               u8 id[6];
--- 
-1.7.9.5
-