Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 602805fb authored by Kamal Dasu's avatar Kamal Dasu Committed by Mark Brown
Browse files

spi: bcm-qspi: Always read and set BSPI_MAST_N_BOOT_CTRL 



Always confirm the BSPI_MAST_N_BOOT_CTRL bit when enabling
or disabling BSPI transfers.

Fixes: 4e3b2d23 ("spi: bcm-qspi: Add BSPI spi-nor flash controller driver")
Signed-off-by: default avatarKamal Dasu <kdasu.kdev@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
parent 5eb9a07a

drivers/spi/spi-bcm-qspi.c

+2 −2
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ static int bcm_qspi_bspi_set_mode(struct bcm_qspi *qspi, 


static void bcm_qspi_enable_bspi(struct bcm_qspi *qspi)

{

	if (!has_bspi(qspi) || (qspi->bspi_enabled))

	if (!has_bspi(qspi))

		return;



	qspi->bspi_enabled = 1;
@@ -505,7 +505,7 @@ static void bcm_qspi_enable_bspi(struct bcm_qspi *qspi) 


static void bcm_qspi_disable_bspi(struct bcm_qspi *qspi)

{

	if (!has_bspi(qspi) || (!qspi->bspi_enabled))

	if (!has_bspi(qspi))

		return;



	qspi->bspi_enabled = 0;