Commit cd7cac9e authored by Lee Jones's avatar Lee Jones Committed by Brian Norris
Browse files

mtd: st_spi_fsm: Supply the W25Qxxx chip specific configuration call-back 



Acked-by Angus Clark <angus.clark@st.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 5343a123

drivers/mtd/devices/st_spi_fsm.c

+43 −4
Original line number Diff line number Diff line
@@ -341,6 +341,7 @@ struct flash_info { 
static int stfsm_n25q_config(struct stfsm *fsm);

static int stfsm_mx25_config(struct stfsm *fsm);

static int stfsm_s25fl_config(struct stfsm *fsm);

static int stfsm_w25q_config(struct stfsm *fsm);



static struct flash_info flash_types[] = {

	/*
@@ -446,10 +447,14 @@ static struct flash_info flash_types[] = { 
		   FLASH_FLAG_READ_1_1_4        |	\

		   FLASH_FLAG_READ_1_4_4        |	\

		   FLASH_FLAG_WRITE_1_1_4)

	{ "w25q80",  0xef4014, 0,  64 * 1024,  16, W25Q_FLAG, 80, NULL },

	{ "w25q16",  0xef4015, 0,  64 * 1024,  32, W25Q_FLAG, 80, NULL },

	{ "w25q32",  0xef4016, 0,  64 * 1024,  64, W25Q_FLAG, 80, NULL },

	{ "w25q64",  0xef4017, 0,  64 * 1024, 128, W25Q_FLAG, 80, NULL },

	{ "w25q80",  0xef4014, 0,  64 * 1024,  16, W25Q_FLAG, 80,

	  stfsm_w25q_config },

	{ "w25q16",  0xef4015, 0,  64 * 1024,  32, W25Q_FLAG, 80,

	  stfsm_w25q_config },

	{ "w25q32",  0xef4016, 0,  64 * 1024,  64, W25Q_FLAG, 80,

	  stfsm_w25q_config },

	{ "w25q64",  0xef4017, 0,  64 * 1024, 128, W25Q_FLAG, 80,

	  stfsm_w25q_config },



	/* Sentinel */

	{ NULL, 0x000000, 0, 0, 0, 0, 0, NULL },
@@ -577,6 +582,11 @@ static struct seq_rw_config stfsm_s25fl_write4_configs[] = { 
	{0x00,                   0,                      0, 0, 0, 0x00, 0, 0},

};



/*

 * [W25Qxxx] Configuration

 */

#define W25Q_STATUS_QE			(0x1 << 9)



static struct stfsm_seq stfsm_seq_read;		/* Dynamically populated */

static struct stfsm_seq stfsm_seq_write;	/* Dynamically populated */

static struct stfsm_seq stfsm_seq_en_32bit_addr;/* Dynamically populated */
@@ -1443,6 +1453,35 @@ static int stfsm_s25fl_config(struct stfsm *fsm) 
	return 0;

}



static int stfsm_w25q_config(struct stfsm *fsm)

{

	uint32_t data_pads;

	uint16_t sta_wr;

	uint8_t sta1, sta2;

	int ret;



	ret = stfsm_prepare_rwe_seqs_default(fsm);

	if (ret)

		return ret;



	/* If using QUAD mode, set QE STATUS bit */

	data_pads = ((stfsm_seq_read.seq_cfg >> 16) & 0x3) + 1;

	if (data_pads == 4) {

		stfsm_read_status(fsm, FLASH_CMD_RDSR, &sta1);

		stfsm_read_status(fsm, FLASH_CMD_RDSR2, &sta2);



		sta_wr = ((uint16_t)sta2 << 8) | sta1;



		sta_wr |= W25Q_STATUS_QE;



		stfsm_write_status(fsm, sta_wr, 2);



		stfsm_wait_busy(fsm);

	}



	return 0;

}



static int stfsm_read(struct stfsm *fsm, uint8_t *buf, uint32_t size,

		      uint32_t offset)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE