aboutsummaryrefslogtreecommitdiffstats
path: root/os/ex/Micron
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2016-05-23 14:42:24 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2016-05-23 14:42:24 +0000
commit4b7feac57b56e5ac49d5370388ce790ebc42a176 (patch)
tree320fa1241ffb9899d25c7eb7e04f6503787f793d /os/ex/Micron
parenta75275648e5410c1698855300b157d48ac2ad7ad (diff)
downloadChibiOS-4b7feac57b56e5ac49d5370388ce790ebc42a176.tar.gz
ChibiOS-4b7feac57b56e5ac49d5370388ce790ebc42a176.tar.bz2
ChibiOS-4b7feac57b56e5ac49d5370388ce790ebc42a176.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9501 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/ex/Micron')
-rw-r--r--os/ex/Micron/m25q.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/os/ex/Micron/m25q.c b/os/ex/Micron/m25q.c
index 8bd1a13e0..9a170a17f 100644
--- a/os/ex/Micron/m25q.c
+++ b/os/ex/Micron/m25q.c
@@ -146,8 +146,7 @@ static const qspi_command_t cmd_write_enable = {
#if M25Q_BUS_MODE == M25Q_BUS_MODE_QSPI1L
QSPI_CFG_CMD_MODE_ONE_LINE,
#elif M25Q_BUS_MODE == M25Q_BUS_MODE_QSPI2L
- QSPI_CFG_CMD_MODE_TWO_LINES |
- QSPI_CFG_DATA_MODE_TWO_LINES,
+ QSPI_CFG_CMD_MODE_TWO_LINES,
#else
QSPI_CFG_CMD_MODE_FOUR_LINES,
#endif
@@ -210,10 +209,10 @@ static const uint8_t evconf_value[1] = {0xCF};
#elif M25Q_BUS_MODE == M25Q_BUS_MODE_QSPI2L
static const uint8_t evconf_value[1] = {0x8F};
#else
-static const uint8_t evconf_value[1] = {0x4F};
+static const uint8_t evconf_value[1] = {0xCF};//{0x4F};
#endif
-#endif
+#endif /* M25Q_BUS_MODE != M25Q_BUS_MODE_SPI */
/*===========================================================================*/
/* Driver local functions. */
@@ -570,8 +569,8 @@ void m25qStart(M25QDriver *devp, const M25QConfig *config) {
#if (M25Q_BUS_MODE != M25Q_BUS_MODE_SPI) && (M25Q_SWITCH_WIDTH == TRUE)
/* Setting up final bus width.*/
-// qspiCommand(devp->config->qspip, &cmd_write_enable);
-// qspiSend(devp->config->qspip, &cmd_write_evconf, 1, evconf_value);
+ qspiCommand(devp->config->qspip, &cmd_write_enable);
+ qspiSend(devp->config->qspip, &cmd_write_evconf, 1, evconf_value);
#endif
flash_cmd_receive(devp, M25Q_CMD_READ_ID, 3, id);