[U-Boot] [PATCH v2 4/4] sf: Add CONFIG_SF_NR_FLASH

[Jagannadha Sutradharudu Teki]

This config will use for defining greater than single flash support.
currently - DUAL_STACKED and DUAL_PARALLEL.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna at xilinx.com>
---
 README                     |  6 ++++++
 drivers/mtd/spi/sf.c       |  3 ++-
 drivers/mtd/spi/sf_ops.c   | 14 ++++++++++----
 drivers/mtd/spi/sf_probe.c |  2 ++
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/README b/README
index 895fef3..20c1f92 100644
--- a/README
+++ b/README
@@ -2751,6 +2751,12 @@ CBFS (Coreboot Filesystem) support
 		Define this option to use the Bank addr/Extended addr
 		support on SPI flashes which has size > 16Mbytes.
 
+		CONFIG_SF_NR_FLASH		Greater than single flash
+
+		Define this option to use greater than single flash connected
+		with a given cs line from controller - currently Xilinx Zynq
+		qspi support dual/two flashes can be connected from single cs.
+
 - SystemACE Support:
 		CONFIG_SYSTEMACE
 
diff --git a/drivers/mtd/spi/sf.c b/drivers/mtd/spi/sf.c
index c780a81..d947d47 100644
--- a/drivers/mtd/spi/sf.c
+++ b/drivers/mtd/spi/sf.c
@@ -18,9 +18,10 @@ static int spi_flash_read_write(struct spi_slave *spi,
 	unsigned long flags = SPI_XFER_BEGIN;
 	int ret;
 
+#ifdef CONFIG_SF_NR_FLASH
 	if (spi->flags & SPI_XFER_U_PAGE)
 		flags |= SPI_XFER_U_PAGE;
-
+#endif
 	if (data_len == 0)
 		flags |= SPI_XFER_END;
 
diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c
index 4fafbc6..914c1b6 100644
--- a/drivers/mtd/spi/sf_ops.c
+++ b/drivers/mtd/spi/sf_ops.c
@@ -131,6 +131,7 @@ static int spi_flash_bank(struct spi_flash *flash, u32 offset)
 }
 #endif
 
+#ifdef CONFIG_SF_NR_FLASH
 static void spi_flash_nr_flash(struct spi_flash *flash, u32 *addr)
 {
 	switch (flash->nr_flash) {
@@ -150,6 +151,7 @@ static void spi_flash_nr_flash(struct spi_flash *flash, u32 *addr)
 		break;
 	}
 }
+#endif
 
 int spi_flash_cmd_wait_ready(struct spi_flash *flash, unsigned long timeout)
 {
@@ -167,9 +169,10 @@ int spi_flash_cmd_wait_ready(struct spi_flash *flash, unsigned long timeout)
 		check_status = poll_bit;
 	}
 
+#ifdef CONFIG_SF_NR_FLASH
 	if (spi->flags & SPI_XFER_U_PAGE)
 		flags |= SPI_XFER_U_PAGE;
-
+#endif
 	ret = spi_xfer(spi, 8, &cmd, NULL, SPI_XFER_BEGIN);
 	if (ret) {
 		debug("SF: fail to read %s status register\n",
@@ -257,9 +260,10 @@ int spi_flash_cmd_erase_ops(struct spi_flash *flash, u32 offset, size_t len)
 	while (len) {
 		erase_addr = offset;
 
+#ifdef CONFIG_SF_NR_FLASH
 		if (flash->nr_flash > SF_NRF_SINGLE)
 			spi_flash_nr_flash(flash, &erase_addr);
-
+#endif
 #ifdef CONFIG_SPI_FLASH_BAR
 		ret = spi_flash_bank(flash, erase_addr);
 		if (ret < 0)
@@ -298,9 +302,10 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset,
 	for (actual = 0; actual < len; actual += chunk_len) {
 		write_addr = offset;
 
+#ifdef CONFIG_SF_NR_FLASH
 		if (flash->nr_flash > SF_NRF_SINGLE)
 			spi_flash_nr_flash(flash, &write_addr);
-
+#endif
 #ifdef CONFIG_SPI_FLASH_BAR
 		ret = spi_flash_bank(flash, write_addr);
 		if (ret < 0)
@@ -382,9 +387,10 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
 	while (len) {
 		read_addr = offset;
 
+#ifdef CONFIG_SF_NR_FLASH
 		if (flash->nr_flash > SF_NRF_SINGLE)
 			spi_flash_nr_flash(flash, &read_addr);
-
+#endif
 #ifdef CONFIG_SPI_FLASH_BAR
 		bank_sel = spi_flash_bank(flash, read_addr);
 		if (bank_sel < 0)
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index 0dc20f9..351a523 100644
--- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c
@@ -150,8 +150,10 @@ static struct spi_flash *spi_flash_validate_params(struct spi_slave *spi,
 	flash->page_size = ((ext_jedec == 0x4d00) ? 512 : 256) << flash->shift;
 	flash->sector_size = params->sector_size << flash->shift;
 	flash->size = flash->sector_size * params->nr_sectors << flash->shift;
+#ifdef CONFIG_SF_NR_FLASH
 	if (flash->nr_flash & SF_NRF_DUAL_STACKED)
 		flash->size <<= 1;
+#endif
 
 	/* Compute erase sector and command */
 	if (params->flags & SECT_4K) {
-- 
1.8.3