From: Rayagonda Kokatanur <rayagonda.kokatanur@broadcom.com>
Date: Fri, 30 Aug 2019 04:28:45 +0000 (+0530)
Subject: spi: bcm-qspi: Make BSPI default mode
X-Git-Tag: for-5.4/post-2019-09-24~60^2^2~56
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ca105398430de8c11e5e56a7bbfb00746ac5a268;p=linux-2.6-block.git

spi: bcm-qspi: Make BSPI default mode

The spi-nor controller defaults to BSPI mode, hence switch back
to its default mode after MSPI operations (write or erase)
are completed.

Signed-off-by: Rayagonda Kokatanur <rayagonda.kokatanur@broadcom.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Kamal Dasu <kdasu.kdev@gmail.com>
Link: https://lore.kernel.org/r/1567139325-7912-1-git-send-email-rayagonda.kokatanur@broadcom.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---

diff --git a/drivers/spi/spi-bcm-qspi.c b/drivers/spi/spi-bcm-qspi.c
index 0dbfd2496ab8..7a3531856491 100644
--- a/drivers/spi/spi-bcm-qspi.c
+++ b/drivers/spi/spi-bcm-qspi.c
@@ -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;
 }