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

Commit ad04996f authored by Kamal Dasu's avatar Kamal Dasu Committed by Greg Kroah-Hartman
Browse files

spi: bcm-qspi: Always read and set BSPI_MAST_N_BOOT_CTRL 



commit 602805fb618b018b7a41fbb3f93c1992b078b1ae upstream.

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
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1c384327

drivers/spi/spi-bcm-qspi.c

+2 −2
Original line number Diff line number Diff line
@@ -514,7 +514,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;
@@ -529,7 +529,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;