diff options
Diffstat (limited to 'drivers/spi/spi-bcm-qspi.c')
| -rw-r--r-- | drivers/spi/spi-bcm-qspi.c | 5 | 
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/spi/spi-bcm-qspi.c b/drivers/spi/spi-bcm-qspi.c index 902bdbfedea8..7a3531856491 100644 --- a/drivers/spi/spi-bcm-qspi.c +++ b/drivers/spi/spi-bcm-qspi.c @@ -343,7 +343,7 @@ static int bcm_qspi_bspi_set_flex_mode(struct bcm_qspi *qspi,  {  	int bpc = 0, bpp = 0;  	u8 command = op->cmd.opcode; -	int width  = op->cmd.buswidth ? op->cmd.buswidth : SPI_NBITS_SINGLE; +	int width = op->data.buswidth ? op->data.buswidth : SPI_NBITS_SINGLE;  	int addrlen = op->addr.nbytes;  	int flex_mode = 1; @@ -897,6 +897,7 @@ static int bcm_qspi_transfer_one(struct spi_master *master,  		read_from_hw(qspi, slots);  	} +	bcm_qspi_enable_bspi(qspi);  	return 0;  } @@ -981,7 +982,7 @@ static int bcm_qspi_exec_mem_op(struct spi_mem *mem,  	if (mspi_read)  		return bcm_qspi_mspi_exec_mem_op(spi, op); -	ret = bcm_qspi_bspi_set_mode(qspi, op, -1); +	ret = bcm_qspi_bspi_set_mode(qspi, op, 0);  	if (!ret)  		ret = bcm_qspi_bspi_exec_mem_op(spi, op);  |