leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spi: stm32_qspi: rework mode management

Browse Source 
This patch solves quad read issue with Macronix/Micron spi nor.

Signed-off-by: Christophe Kerello <christophe.kerello@st.com>
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
This commit is contained in:
Christophe Kerello 2018-07-09 15:32:38 +02:00 committed by Tom Rini
parent ceff933e1e
commit d68b6ad138
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/spi/stm32_qspi.c
View File

@ -229,21 +229,21 @@ static unsigned int _stm32_qspi_gen_ccr(struct stm32_qspi_priv *priv, u8 fmode)
imode = STM32_QSPI_CCR_IMODE_ONE_LINE;
admode = STM32_QSPI_CCR_ADMODE_ONE_LINE;
dmode = STM32_QSPI_CCR_DMODE_ONE_LINE;
if (mode & SPI_RX_QUAD) {
dmode = STM32_QSPI_CCR_DMODE_FOUR_LINE;
if (mode & SPI_TX_QUAD) {
imode = STM32_QSPI_CCR_IMODE_FOUR_LINE;
admode = STM32_QSPI_CCR_ADMODE_FOUR_LINE;
if ((priv->command & CMD_HAS_ADR) && (priv->command & CMD_HAS_DATA)) {
if (fmode == STM32_QSPI_CCR_IND_WRITE) {
if (mode & SPI_TX_QUAD)
dmode = STM32_QSPI_CCR_DMODE_FOUR_LINE;
else if (mode & SPI_TX_DUAL)
dmode = STM32_QSPI_CCR_DMODE_TWO_LINE;
} else if ((fmode == STM32_QSPI_CCR_MEM_MAP) ||
(fmode == STM32_QSPI_CCR_IND_READ)) {
if (mode & SPI_RX_QUAD)
dmode = STM32_QSPI_CCR_DMODE_FOUR_LINE;
else if (mode & SPI_RX_DUAL)
dmode = STM32_QSPI_CCR_DMODE_TWO_LINE;
}
} else if (mode & SPI_RX_DUAL) {
dmode = STM32_QSPI_CCR_DMODE_TWO_LINE;
if (mode & SPI_TX_DUAL) {
imode = STM32_QSPI_CCR_IMODE_TWO_LINE;
admode = STM32_QSPI_CCR_ADMODE_TWO_LINE;
}
} else {
dmode = STM32_QSPI_CCR_DMODE_ONE_LINE;
}
if (priv->command & CMD_HAS_DATA)