summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/devices
diff options
context:
space:
mode:
authorAngus Clark <angus.clark@st.com>2014-03-26 16:39:17 +0000
committerBrian Norris <computersforpeace@gmail.com>2014-04-14 11:22:59 -0700
commitcc6668637ebed620eaafc807802f3d85b193f534 (patch)
tree0465203ccba705e77131e9bcdb8a3c143f490078 /drivers/mtd/devices
parent009e7e61b1f15b16964f1b4b6bb1e30e6b03dc3b (diff)
downloadlinux-cc6668637ebed620eaafc807802f3d85b193f534.tar.bz2
mtd: st_spi_fsm: Update Macronix 'QE' configuration
Update the configuration of the Macronix 'QE' bit, such that we only set or clear the bit if required. Signed-off-by: Angus Clark <angus.clark@st.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd/devices')
-rw-r--r--drivers/mtd/devices/st_spi_fsm.c23
1 files changed, 19 insertions, 4 deletions
diff --git a/drivers/mtd/devices/st_spi_fsm.c b/drivers/mtd/devices/st_spi_fsm.c
index 40eb830eea21..f86d3e01433b 100644
--- a/drivers/mtd/devices/st_spi_fsm.c
+++ b/drivers/mtd/devices/st_spi_fsm.c
@@ -1164,12 +1164,27 @@ static int stfsm_mx25_config(struct stfsm *fsm)
CFG_ERASESEC_TOGGLE_32BIT_ADDR);
}
- /* For QUAD mode, set 'QE' STATUS bit */
+ /* Check status of 'QE' bit */
+ stfsm_read_status(fsm, FLASH_CMD_RDSR, &sta);
data_pads = ((fsm->stfsm_seq_read.seq_cfg >> 16) & 0x3) + 1;
if (data_pads == 4) {
- stfsm_read_status(fsm, FLASH_CMD_RDSR, &sta);
- sta |= MX25_STATUS_QE;
- stfsm_write_status(fsm, sta, 1);
+ if (!(sta & MX25_STATUS_QE)) {
+ /* Set 'QE' */
+ sta |= MX25_STATUS_QE;
+
+ stfsm_write_status(fsm, sta, 1);
+
+ stfsm_wait_busy(fsm);
+ }
+ } else {
+ if (sta & MX25_STATUS_QE) {
+ /* Clear 'QE' */
+ sta &= ~MX25_STATUS_QE;
+
+ stfsm_write_status(fsm, sta, 1);
+
+ stfsm_wait_busy(fsm);
+ }
}
return 0;