From: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
Date: Fri, 20 Jan 2017 09:44:58 +0000 (+0530)
Subject: spi: spi_flash: Clear BP bits for upper flash as well
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ff5421d335efd9629390c0501b491c782300e58;p=thirdparty%2Fu-boot.git

spi: spi_flash: Clear BP bits for upper flash as well

Clear BP bits for upper flash as well incase of
dual parallel if we are using genric spi.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c
index 96a4150eec1..23bda15a89b 100644
--- a/drivers/mtd/spi/spi_flash.c
+++ b/drivers/mtd/spi/spi_flash.c
@@ -1219,7 +1219,20 @@ int spi_flash_scan(struct spi_flash *flash)
 	if (JEDEC_MFR(info) == SPI_FLASH_CFI_MFR_ATMEL ||
 	    JEDEC_MFR(info) == SPI_FLASH_CFI_MFR_MACRONIX ||
 	    JEDEC_MFR(info) == SPI_FLASH_CFI_MFR_SST)
+#ifdef CONFIG_SPI_GENERIC
+	{
+		flash->dual_flash = flash->spi->option;
+		if (flash->dual_flash & SF_DUAL_PARALLEL_FLASH)
+			flash->spi->flags |= SPI_XFER_LOWER;
+#endif
 		write_sr(flash, 0);
+#ifdef CONFIG_SPI_GENERIC
+		if (flash->dual_flash & SF_DUAL_PARALLEL_FLASH) {
+			flash->spi->flags |= SPI_XFER_UPPER;
+			write_sr(flash, 0);
+		}
+	}
+#endif
 
 	flash->name = info->name;
 	flash->memory_map = spi->memory_map;