Skip to contentSkip to conversation

sf: Get spi locally from spi_flash

PATCH Superseded Jagan Teki 2 participants 6 messages Dec 13, 2015 – Dec 14, 2015

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH 1/4 sf: Get spi locally from spi_flash

For better code readabilty, get the spi pointer from spi_flash{} locally and use it instead of direct dereferring spi pinter as flash->spi->*

---
 drivers/mtd/spi/spi_flash.c | 48 ++++++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 22 deletions(-)
drivers/mtd/spi/spi_flash.c +26 -22
index 7ffa136..ebf8b9c 100644
@@ -177,13 +177,15 @@ bank_end:
 #ifdef CONFIG_SF_DUAL_FLASH
 static void spi_flash_dual(struct spi_flash *flash, u32 *addr)
 {
+	struct spi_slave *spi = flash->spi;
+
 	switch (flash->dual_flash) {
 	case SF_DUAL_STACKED_FLASH:
 		if (*addr >= (flash->size >> 1)) {
 			*addr -= flash->size >> 1;
-			flash->spi->flags |= SPI_XFER_U_PAGE;
+			spi->flags |= SPI_XFER_U_PAGE;
 		} else {
-			flash->spi->flags &= ~SPI_XFER_U_PAGE;
+			spi->flags &= ~SPI_XFER_U_PAGE;
 		}
 		break;
 	case SF_DUAL_PARALLEL_FLASH:
@@ -268,7 +270,7 @@ int spi_flash_write_common(struct spi_flash *flash, const u8 *cmd,
 	if (buf == NULL)
 		timeout = SPI_FLASH_PAGE_ERASE_TIMEOUT;
 
-	ret = spi_claim_bus(flash->spi);
+	ret = spi_claim_bus(spi);
 	if (ret) {
 		debug("SF: unable to claim SPI bus\n");
 		return ret;
@@ -353,6 +355,7 @@ int spi_flash_cmd_erase_ops(struct spi_flash *flash, u32 offset, size_t len)
 int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset,
 		size_t len, const void *buf)
 {
+	struct spi_slave *spi = flash->spi;
 	unsigned long byte_addr, page_size;
 	u32 write_addr;
 	size_t chunk_len, actual;
@@ -385,9 +388,9 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset,
 		byte_addr = offset % page_size;
 		chunk_len = min(len - actual, (size_t)(page_size - byte_addr));
 
-		if (flash->spi->max_write_size)
+		if (spi->max_write_size)
 			chunk_len = min(chunk_len,
-					(size_t)flash->spi->max_write_size);
+					(size_t)spi->max_write_size);
 
 		spi_flash_addr(write_addr, cmd);
 
@@ -413,7 +416,7 @@ int spi_flash_read_common(struct spi_flash *flash, const u8 *cmd,
 	struct spi_slave *spi = flash->spi;
 	int ret;
 
-	ret = spi_claim_bus(flash->spi);
+	ret = spi_claim_bus(spi);
 	if (ret) {
 		debug("SF: unable to claim SPI bus\n");
 		return ret;
@@ -438,6 +441,7 @@ void __weak spi_flash_copy_mmap(void *data, void *offset, size_t len)
 int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
 		size_t len, void *data)
 {
+	struct spi_slave *spi = flash->spi;
 	u8 *cmd, cmdsz;
 	u32 remain_len, read_len, read_addr;
 	int bank_sel = 0;
@@ -445,15 +449,15 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
 
 	/* Handle memory-mapped SPI */
 	if (flash->memory_map) {
-		ret = spi_claim_bus(flash->spi);
+		ret = spi_claim_bus(spi);
 		if (ret) {
 			debug("SF: unable to claim SPI bus\n");
 			return ret;
 		}
-		spi_xfer(flash->spi, 0, NULL, NULL, SPI_XFER_MMAP);
+		spi_xfer(spi, 0, NULL, NULL, SPI_XFER_MMAP);
 		spi_flash_copy_mmap(data, flash->memory_map + offset, len);
-		spi_xfer(flash->spi, 0, NULL, NULL, SPI_XFER_MMAP_END);
-		spi_release_bus(flash->spi);
+		spi_xfer(spi, 0, NULL, NULL, SPI_XFER_MMAP_END);
+		spi_release_bus(spi);
 		return 0;
 	}
 
@@ -514,13 +518,13 @@ static int sst_byte_write(struct spi_flash *flash, u32 offset, const void *buf)
 	};
 
 	debug("BP[%02x]: 0x%p => cmd = { 0x%02x 0x%06x }\n",
-	      spi_w8r8(flash->spi, CMD_READ_STATUS), buf, cmd[0], offset);
+	      spi_w8r8(spi, CMD_READ_STATUS), buf, cmd[0], offset);
 
 	ret = spi_flash_cmd_write_enable(flash);
 	if (ret)
 		return ret;
 
-	ret = spi_flash_cmd_write(flash->spi, cmd, sizeof(cmd), buf, 1);
+	ret = spi_flash_cmd_write(spi, cmd, sizeof(cmd), buf, 1);
 	if (ret)
 		return ret;
 
@@ -534,7 +538,7 @@ int sst_write_wp(struct spi_flash *flash, u32 offset, size_t len,
 	int ret;
 	u8 cmd[4];
 
-	ret = spi_claim_bus(flash->spi);
+	ret = spi_claim_bus(spi);
 	if (ret) {
 		debug("SF: Unable to claim SPI bus\n");
 		return ret;
@@ -561,10 +565,10 @@ int sst_write_wp(struct spi_flash *flash, u32 offset, size_t len,
 
 	for (; actual < len - 1; actual += 2) {
 		debug("WP[%02x]: 0x%p => cmd = { 0x%02x 0x%06x }\n",
-		      spi_w8r8(flash->spi, CMD_READ_STATUS), buf + actual,
+		      spi_w8r8(spi, CMD_READ_STATUS), buf + actual,
 		      cmd[0], offset);
 
-		ret = spi_flash_cmd_write(flash->spi, cmd, cmd_len,
+		ret = spi_flash_cmd_write(spi, cmd, cmd_len,
 					buf + actual, 2);
 		if (ret) {
 			debug("SF: sst word program failed\n");
@@ -590,7 +594,7 @@ int sst_write_wp(struct spi_flash *flash, u32 offset, size_t len,
 	debug("SF: sst: program %s %zu bytes @ 0x%zx\n",
 	      ret ? "failure" : "success", len, offset - actual);
 
-	spi_release_bus(flash->spi);
+	spi_release_bus(spi);
 	return ret;
 }
 
@@ -600,7 +604,7 @@ int sst_write_bp(struct spi_flash *flash, u32 offset, size_t len,
 	size_t actual;
 	int ret;
 
-	ret = spi_claim_bus(flash->spi);
+	ret = spi_claim_bus(spi);
 	if (ret) {
 		debug("SF: Unable to claim SPI bus\n");
 		return ret;
@@ -621,7 +625,7 @@ int sst_write_bp(struct spi_flash *flash, u32 offset, size_t len,
 	debug("SF: sst: program %s %zu bytes @ 0x%zx\n",
 	      ret ? "failure" : "success", len, offset - actual);
 
-	spi_release_bus(flash->spi);
+	spi_release_bus(spi);
 	return ret;
 }
 #endif
@@ -950,7 +954,7 @@ int spi_flash_scan(struct spi_flash *flash)
 	/* Assign spi data */
 	flash->name = params->name;
 	flash->memory_map = spi->memory_map;
-	flash->dual_flash = flash->spi->option;
+	flash->dual_flash = spi->option;
 
 	/* Assign spi flash flags */
 	if (params->flags & SST_WR)
@@ -961,7 +965,7 @@ int spi_flash_scan(struct spi_flash *flash)
 	flash->write = spi_flash_cmd_write_ops;
 #if defined(CONFIG_SPI_FLASH_SST)
 	if (flash->flags & SNOR_F_SST_WR) {
-		if (flash->spi->op_mode_tx & SPI_OPM_TX_BP)
+		if (spi->op_mode_tx & SPI_OPM_TX_BP)
 			flash->write = sst_write_bp;
 		else
 			flash->write = sst_write_wp;
@@ -1025,7 +1029,7 @@ int spi_flash_scan(struct spi_flash *flash)
 	flash->sector_size = flash->erase_size;
 
 	/* Look for the fastest read cmd */
-	cmd = fls(params->e_rd_cmd & flash->spi->op_mode_rx);
+	cmd = fls(params->e_rd_cmd & spi->op_mode_rx);
 	if (cmd) {
 		cmd = spi_read_cmds_array[cmd - 1];
 		flash->read_cmd = cmd;
@@ -1035,7 +1039,7 @@ int spi_flash_scan(struct spi_flash *flash)
 	}
 
 	/* Not require to look for fastest only two write cmds yet */
-	if (params->flags & WR_QPP && flash->spi->op_mode_tx & SPI_OPM_TX_QPP)
+	if (params->flags & WR_QPP && spi->op_mode_tx & SPI_OPM_TX_QPP)
 		flash->write_cmd = CMD_QUAD_PAGE_PROGRAM;
 	else
 		/* Go for default supported write cmd */
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 2/4 spi: Use mode instead of op_mode_tx

Used mode member from spi_slave{} instead of op_mode_tx.

Cc Bin Meng <[email protected]>
Cc Simon Glass <[email protected]>
---
 drivers/mtd/spi/sf_probe.c  | 2 +-
 drivers/mtd/spi/spi_flash.c | 4 ++--
 drivers/spi/ich.c           | 2 +-
 include/spi.h               | 8 ++------
 4 files changed, 6 insertions(+), 10 deletions(-)
drivers/mtd/spi/sf_probe.c +1 -1
index 0cafc29..3519ffd 100644
@@ -128,7 +128,7 @@ static int spi_flash_std_write(struct udevice *dev, u32 offset, size_t len,
 
 #if defined(CONFIG_SPI_FLASH_SST)
 	if (flash->flags & SNOR_F_SST_WR) {
-		if (flash->spi->op_mode_tx & SPI_OPM_TX_BP)
+		if (flash->spi->mode & SPI_TX_BP)
 			return sst_write_bp(flash, offset, len, buf);
 		else
 			return sst_write_wp(flash, offset, len, buf);
drivers/mtd/spi/spi_flash.c +2 -2
index ebf8b9c..32269b0 100644
@@ -965,7 +965,7 @@ int spi_flash_scan(struct spi_flash *flash)
 	flash->write = spi_flash_cmd_write_ops;
 #if defined(CONFIG_SPI_FLASH_SST)
 	if (flash->flags & SNOR_F_SST_WR) {
-		if (spi->op_mode_tx & SPI_OPM_TX_BP)
+		if (spi->mode & SPI_TX_BP)
 			flash->write = sst_write_bp;
 		else
 			flash->write = sst_write_wp;
@@ -1039,7 +1039,7 @@ int spi_flash_scan(struct spi_flash *flash)
 	}
 
 	/* Not require to look for fastest only two write cmds yet */
-	if (params->flags & WR_QPP && spi->op_mode_tx & SPI_OPM_TX_QPP)
+	if (params->flags & WR_QPP && spi->mode & SPI_TX_QPP)
 		flash->write_cmd = CMD_QUAD_PAGE_PROGRAM;
 	else
 		/* Go for default supported write cmd */
drivers/spi/ich.c +1 -1
index f85af9c..64322dd 100644
@@ -753,7 +753,7 @@ static int ich_spi_child_pre_probe(struct udevice *dev)
 	 */
 	if (plat->ich_version == 7) {
 		slave->op_mode_rx = SPI_OPM_RX_AS;
-		slave->op_mode_tx = SPI_OPM_TX_BP;
+		slave->mode = SPI_TX_BP;
 	}
 
 	return 0;
include/spi.h +2 -6
index b4d2723..985e007 100644
@@ -23,6 +23,8 @@
 #define	SPI_LOOP	0x20			/* loopback mode */
 #define	SPI_SLAVE	0x40			/* slave mode */
 #define	SPI_PREAMBLE	0x80			/* Skip preamble bytes */
+#define SPI_TX_BP	0x100			/* transmit with 1 wire byte */
+#define SPI_TX_QPP	0x200			/* transmit with 4 wires */
 
 /* SPI transfer flags */
 #define SPI_XFER_BEGIN		0x01	/* Assert CS before transfer */
@@ -32,10 +34,6 @@
 #define SPI_XFER_ONCE		(SPI_XFER_BEGIN | SPI_XFER_END)
 #define SPI_XFER_U_PAGE	(1 << 5)
 
-/* SPI TX operation modes */
-#define SPI_OPM_TX_QPP		(1 << 0)
-#define SPI_OPM_TX_BP		(1 << 1)
-
 /* SPI RX operation modes */
 #define SPI_OPM_RX_AS		(1 << 0)
 #define SPI_OPM_RX_AF		(1 << 1)
@@ -107,7 +105,6 @@ struct dm_spi_slave_platdata {
  *			bus (bus->seq) so does not need to be stored
  * @cs:			ID of the chip select connected to the slave.
  * @op_mode_rx:		SPI RX operation mode.
- * @op_mode_tx:		SPI TX operation mode.
  * @wordlen:		Size of SPI word in number of bits
  * @max_write_size:	If non-zero, the maximum number of bytes which can
  *			be written at once, excluding command bytes.
@@ -126,7 +123,6 @@ struct spi_slave {
 	unsigned int cs;
 #endif
 	u8 op_mode_rx;
-	u8 op_mode_tx;
 	unsigned int wordlen;
 	unsigned int max_write_size;
 	void *memory_map;
Signature · 1 line
1.9.1
author
#2 lore raw

PATCH 3/4 spi: Rename SPI_TX_BP|QPP to SPI_TX_BYTE|QUAD

In reply to Jagan Teki

Since SPI_TX_* are spi_slave{} members so use spi protocol notation instead spi flash programming, like

SPI_TX_BP => SPI_TX_BYTE
SPI_TX_QPP => SPI_TX_QUAD

Cc Bin Meng <[email protected]>
Cc Simon Glass <[email protected]>
---
 drivers/mtd/spi/sf_probe.c  | 2 +-
 drivers/mtd/spi/spi_flash.c | 4 ++--
 drivers/spi/ich.c           | 2 +-
 include/spi.h               | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
drivers/mtd/spi/sf_probe.c +1 -1
index 3519ffd..daa1d5b 100644
@@ -128,7 +128,7 @@ static int spi_flash_std_write(struct udevice *dev, u32 offset, size_t len,
 
 #if defined(CONFIG_SPI_FLASH_SST)
 	if (flash->flags & SNOR_F_SST_WR) {
-		if (flash->spi->mode & SPI_TX_BP)
+		if (flash->spi->mode & SPI_TX_BYTE)
 			return sst_write_bp(flash, offset, len, buf);
 		else
 			return sst_write_wp(flash, offset, len, buf);
drivers/mtd/spi/spi_flash.c +2 -2
index 32269b0..cbd456b 100644
@@ -965,7 +965,7 @@ int spi_flash_scan(struct spi_flash *flash)
 	flash->write = spi_flash_cmd_write_ops;
 #if defined(CONFIG_SPI_FLASH_SST)
 	if (flash->flags & SNOR_F_SST_WR) {
-		if (spi->mode & SPI_TX_BP)
+		if (spi->mode & SPI_TX_BYTE)
 			flash->write = sst_write_bp;
 		else
 			flash->write = sst_write_wp;
@@ -1039,7 +1039,7 @@ int spi_flash_scan(struct spi_flash *flash)
 	}
 
 	/* Not require to look for fastest only two write cmds yet */
-	if (params->flags & WR_QPP && spi->mode & SPI_TX_QPP)
+	if (params->flags & WR_QPP && spi->mode & SPI_TX_QUAD)
 		flash->write_cmd = CMD_QUAD_PAGE_PROGRAM;
 	else
 		/* Go for default supported write cmd */
drivers/spi/ich.c +1 -1
index 64322dd..d11132c 100644
@@ -753,7 +753,7 @@ static int ich_spi_child_pre_probe(struct udevice *dev)
 	 */
 	if (plat->ich_version == 7) {
 		slave->op_mode_rx = SPI_OPM_RX_AS;
-		slave->mode = SPI_TX_BP;
+		slave->mode = SPI_TX_BYTE;
 	}
 
 	return 0;
include/spi.h +2 -2
index 985e007..dc430ea 100644
@@ -23,8 +23,8 @@
 #define	SPI_LOOP	0x20			/* loopback mode */
 #define	SPI_SLAVE	0x40			/* slave mode */
 #define	SPI_PREAMBLE	0x80			/* Skip preamble bytes */
-#define SPI_TX_BP	0x100			/* transmit with 1 wire byte */
-#define SPI_TX_QPP	0x200			/* transmit with 4 wires */
+#define SPI_TX_BYTE	0x100			/* transmit with 1 wire byte */
+#define SPI_TX_QUAD	0x200			/* transmit with 4 wires */
 
 /* SPI transfer flags */
 #define SPI_XFER_BEGIN		0x01	/* Assert CS before transfer */
Signature · 1 line
1.9.1
author
#3 lore raw

PATCH 4/4 sf: Move spi_read_cmds_array locally

In reply to Jagan Teki

Since spi_read_cmds_array is used locally in
spi_flash_scan, so move array to locally used
function instead of defining global array.

---
 drivers/mtd/spi/spi_flash.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)
drivers/mtd/spi/spi_flash.c +8 -12
index cbd456b..781e275 100644
@@ -29,16 +29,6 @@ static void spi_flash_addr(u32 addr, u8 *cmd)
 	cmd[3] = addr >> 0;
 }
 
-/* Read commands array */
-static u8 spi_read_cmds_array[] = {
-	CMD_READ_ARRAY_SLOW,
-	CMD_READ_ARRAY_FAST,
-	CMD_READ_DUAL_OUTPUT_FAST,
-	CMD_READ_DUAL_IO_FAST,
-	CMD_READ_QUAD_OUTPUT_FAST,
-	CMD_READ_QUAD_IO_FAST,
-};
-
 static int read_sr(struct spi_flash *flash, u8 *rs)
 {
 	int ret;
@@ -906,9 +896,15 @@ int spi_flash_scan(struct spi_flash *flash)
 	struct spi_slave *spi = flash->spi;
 	const struct spi_flash_params *params;
 	u16 jedec, ext_jedec;
-	u8 idcode[5];
-	u8 cmd;
+	u8 cmd, idcode[5];
 	int ret;
+	static u8 spi_read_cmds_array[] = {
+		CMD_READ_ARRAY_SLOW,
+		CMD_READ_ARRAY_FAST,
+		CMD_READ_DUAL_OUTPUT_FAST,
+		CMD_READ_DUAL_IO_FAST,
+		CMD_READ_QUAD_OUTPUT_FAST,
+		CMD_READ_QUAD_IO_FAST };
 
 	/* Read the ID codes */
 	ret = spi_flash_cmd(spi, CMD_READ_ID, idcode, sizeof(idcode));
Signature · 1 line
1.9.1
#5 lore raw

PATCH 1/4 sf: Get spi locally from spi_flash

In reply to Jagan Teki

Hi Jagan,

Quoted 98 lines · Jagan Teki

For better code readabilty, get the spi pointer from spi_flash{} locally and use it instead of direct dereferring spi pinter as flash->spi->*

---
 drivers/mtd/spi/spi_flash.c | 48 ++++++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 22 deletions(-)
drivers/mtd/spi/spi_flash.c +14 -10
index 7ffa136..ebf8b9c 100644
@@ -177,13 +177,15 @@ bank_end:
 #ifdef CONFIG_SF_DUAL_FLASH
 static void spi_flash_dual(struct spi_flash *flash, u32 *addr)
 {
+       struct spi_slave *spi = flash->spi;
+
        switch (flash->dual_flash) {
        case SF_DUAL_STACKED_FLASH:
                if (*addr >= (flash->size >> 1)) {
                        *addr -= flash->size >> 1;
-                       flash->spi->flags |= SPI_XFER_U_PAGE;
+                       spi->flags |= SPI_XFER_U_PAGE;
                } else {
-                       flash->spi->flags &= ~SPI_XFER_U_PAGE;
+                       spi->flags &= ~SPI_XFER_U_PAGE;
                }
                break;
        case SF_DUAL_PARALLEL_FLASH:
@@ -268,7 +270,7 @@ int spi_flash_write_common(struct spi_flash *flash, const u8 *cmd,
        if (buf == NULL)
                timeout = SPI_FLASH_PAGE_ERASE_TIMEOUT;
 
-       ret = spi_claim_bus(flash->spi);
+       ret = spi_claim_bus(spi);
        if (ret) {
                debug("SF: unable to claim SPI bus\n");
                return ret;
@@ -353,6 +355,7 @@ int spi_flash_cmd_erase_ops(struct spi_flash *flash, u32 offset, size_t len)
 int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset,
                size_t len, const void *buf)
 {
+       struct spi_slave *spi = flash->spi;
        unsigned long byte_addr, page_size;
        u32 write_addr;
        size_t chunk_len, actual;
@@ -385,9 +388,9 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset,
                byte_addr = offset % page_size;
                chunk_len = min(len - actual, (size_t)(page_size - byte_addr));
 
-               if (flash->spi->max_write_size)
+               if (spi->max_write_size)
                        chunk_len = min(chunk_len,
-                                       (size_t)flash->spi->max_write_size);
+                                       (size_t)spi->max_write_size);
 
                spi_flash_addr(write_addr, cmd);
 
@@ -413,7 +416,7 @@ int spi_flash_read_common(struct spi_flash *flash, const u8 *cmd,
        struct spi_slave *spi = flash->spi;
        int ret;
 
-       ret = spi_claim_bus(flash->spi);
+       ret = spi_claim_bus(spi);
        if (ret) {
                debug("SF: unable to claim SPI bus\n");
                return ret;
@@ -438,6 +441,7 @@ void __weak spi_flash_copy_mmap(void *data, void *offset, size_t len)
 int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
                size_t len, void *data)
 {
+       struct spi_slave *spi = flash->spi;
        u8 *cmd, cmdsz;
        u32 remain_len, read_len, read_addr;
        int bank_sel = 0;
@@ -445,15 +449,15 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
 
        /* Handle memory-mapped SPI */
        if (flash->memory_map) {
-               ret = spi_claim_bus(flash->spi);
+               ret = spi_claim_bus(spi);
                if (ret) {
                        debug("SF: unable to claim SPI bus\n");
                        return ret;
                }
-               spi_xfer(flash->spi, 0, NULL, NULL, SPI_XFER_MMAP);
+               spi_xfer(spi, 0, NULL, NULL, SPI_XFER_MMAP);
                spi_flash_copy_mmap(data, flash->memory_map + offset, len);
-               spi_xfer(flash->spi, 0, NULL, NULL, SPI_XFER_MMAP_END);
-               spi_release_bus(flash->spi);
+               spi_xfer(spi, 0, NULL, NULL, SPI_XFER_MMAP_END);
+               spi_release_bus(spi);
                return 0;
        }
 

drivers/mtd/spi/spi_flash.c static int sst_byte_write(struct spi_flash *flash, u32 offset, const void *buf) · line 521

Quoted 5 lines
drivers/mtd/spi/spi_flash.c +1 -1
@@ -514,13 +518,13 @@ static int sst_byte_write(struct spi_flash *flash, u32 offset, const void *buf)
        };
 
        debug("BP[%02x]: 0x%p => cmd = { 0x%02x 0x%06x }\n",
-             spi_w8r8(flash->spi, CMD_READ_STATUS), buf, cmd[0], offset);
+             spi_w8r8(spi, CMD_READ_STATUS), buf, cmd[0], offset);

This does not build as spi is undeclared.

Quoted 11 lines
drivers/mtd/spi/spi_flash.c +1 -1
        ret = spi_flash_cmd_write_enable(flash);
        if (ret)
                return ret;
 
-       ret = spi_flash_cmd_write(flash->spi, cmd, sizeof(cmd), buf, 1);
+       ret = spi_flash_cmd_write(spi, cmd, sizeof(cmd), buf, 1);
        if (ret)
                return ret;
 

drivers/mtd/spi/spi_flash.c int sst_write_wp(struct spi_flash *flash, u32 offset, size_t len, · line 541

Quoted 5 lines
drivers/mtd/spi/spi_flash.c +1 -1
@@ -534,7 +538,7 @@ int sst_write_wp(struct spi_flash *flash, u32 offset, size_t len,
        int ret;
        u8 cmd[4];
 
-       ret = spi_claim_bus(flash->spi);
+       ret = spi_claim_bus(spi);

This does not build as spi is undeclared.

Quoted 26 lines
drivers/mtd/spi/spi_flash.c +3 -3
        if (ret) {
                debug("SF: Unable to claim SPI bus\n");
                return ret;
@@ -561,10 +565,10 @@ int sst_write_wp(struct spi_flash *flash, u32 offset, size_t len,
 
        for (; actual < len - 1; actual += 2) {
                debug("WP[%02x]: 0x%p => cmd = { 0x%02x 0x%06x }\n",
-                     spi_w8r8(flash->spi, CMD_READ_STATUS), buf + actual,
+                     spi_w8r8(spi, CMD_READ_STATUS), buf + actual,
                      cmd[0], offset);
 
-               ret = spi_flash_cmd_write(flash->spi, cmd, cmd_len,
+               ret = spi_flash_cmd_write(spi, cmd, cmd_len,
                                        buf + actual, 2);
                if (ret) {
                        debug("SF: sst word program failed\n");
@@ -590,7 +594,7 @@ int sst_write_wp(struct spi_flash *flash, u32 offset, size_t len,
        debug("SF: sst: program %s %zu bytes @ 0x%zx\n",
              ret ? "failure" : "success", len, offset - actual);
 
-       spi_release_bus(flash->spi);
+       spi_release_bus(spi);
        return ret;
 }
 

drivers/mtd/spi/spi_flash.c int sst_write_bp(struct spi_flash *flash, u32 offset, size_t len, · line 607

Quoted 5 lines
drivers/mtd/spi/spi_flash.c +1 -1
@@ -600,7 +604,7 @@ int sst_write_bp(struct spi_flash *flash, u32 offset, size_t len,
        size_t actual;
        int ret;
 
-       ret = spi_claim_bus(flash->spi);
+       ret = spi_claim_bus(spi);

This does not build as spi is undeclared.

Quoted 40 lines
drivers/mtd/spi/spi_flash.c +4 -4
        if (ret) {
                debug("SF: Unable to claim SPI bus\n");
                return ret;
@@ -621,7 +625,7 @@ int sst_write_bp(struct spi_flash *flash, u32 offset, size_t len,
        debug("SF: sst: program %s %zu bytes @ 0x%zx\n",
              ret ? "failure" : "success", len, offset - actual);
 
-       spi_release_bus(flash->spi);
+       spi_release_bus(spi);
        return ret;
 }
 #endif
@@ -950,7 +954,7 @@ int spi_flash_scan(struct spi_flash *flash)
        /* Assign spi data */
        flash->name = params->name;
        flash->memory_map = spi->memory_map;
-       flash->dual_flash = flash->spi->option;
+       flash->dual_flash = spi->option;
 
        /* Assign spi flash flags */
        if (params->flags & SST_WR)
@@ -961,7 +965,7 @@ int spi_flash_scan(struct spi_flash *flash)
        flash->write = spi_flash_cmd_write_ops;
 #if defined(CONFIG_SPI_FLASH_SST)
        if (flash->flags & SNOR_F_SST_WR) {
-               if (flash->spi->op_mode_tx & SPI_OPM_TX_BP)
+               if (spi->op_mode_tx & SPI_OPM_TX_BP)
                        flash->write = sst_write_bp;
                else
                        flash->write = sst_write_wp;
@@ -1025,7 +1029,7 @@ int spi_flash_scan(struct spi_flash *flash)
        flash->sector_size = flash->erase_size;
 
        /* Look for the fastest read cmd */
-       cmd = fls(params->e_rd_cmd & flash->spi->op_mode_rx);
+       cmd = fls(params->e_rd_cmd & spi->op_mode_rx);
        if (cmd) {
                cmd = spi_read_cmds_array[cmd - 1];
                flash->read_cmd = cmd;

drivers/mtd/spi/spi_flash.c int spi_flash_scan(struct spi_flash *flash)

Quoted 9 lines
drivers/mtd/spi/spi_flash.c +1 -2
@@ -1035,7 +1039,7 @@ int spi_flash_scan(struct spi_flash *flash)
        }
 
        /* Not require to look for fastest only two write cmds yet */
-       if (params->flags & WR_QPP && flash->spi->op_mode_tx & SPI_OPM_TX_QPP)
+       if (params->flags & WR_QPP && spi->op_mode_tx & SPI_OPM_TX_QPP)
                flash->write_cmd = CMD_QUAD_PAGE_PROGRAM;
        else
                /* Go for default supported write cmd */
--

I will test the rest of this series after you fix this very first patch.

Regards,
Bin