ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Nuvoton: Fix degrading QSPI to SPI 

In most cases, we can control degraded QSPI H/W to standard through BSP SPI driver directly as if it is just SPI H/W.
However, BSP SPI driver distinguishes among SPI H/W instances in below functions:
-   SPI_Open
-   SPI_Close
-   SPI_SetBusClock
-   SPI_GetBusClock
In these cases, we must change to QSPI version instead for QSPI H/W.

Change target:
-   NU_M2354*
pull/13537/head
Chun-Chieh Li 2020-09-03 11:29:04 +08:00
parent e4350393d2
commit 9c86871a9f
1 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
targets/TARGET_NUVOTON/TARGET_M2354/spi_api.c
View File

@ -76,6 +76,21 @@ static struct nu_spi_var spi4_var = {
#endif #endif
}; };
/* Change to QSPI version functions
*
* In most cases, we can control degraded QSPI H/W to standard through BSP SPI driver
* directly as if it is just SPI H/W. However, BSP SPI driver distinguishes among
* SPI H/W instances in below functions:
*
* SPI_Open
* SPI_Close
* SPI_SetBusClock
* SPI_GetBusClock
*
* In these cases, we must change to QSPI version instead for QSPI H/W.
*/
static int spi_is_qspi(spi_t *obj);
/* Synchronous version of SPI_ENABLE()/SPI_DISABLE() macros /* Synchronous version of SPI_ENABLE()/SPI_DISABLE() macros
* *
* The SPI peripheral clock is asynchronous with the system clock. In order to make sure the SPI * The SPI peripheral clock is asynchronous with the system clock. In order to make sure the SPI
@ -210,7 +225,11 @@ void spi_free(spi_t *obj)
} }
#endif #endif
SPI_Close((SPI_T *) NU_MODBASE(obj->spi.spi)); if (spi_is_qspi(obj)) {
QSPI_Close((QSPI_T *) NU_MODBASE(obj->spi.spi));
} else {
SPI_Close((SPI_T *) NU_MODBASE(obj->spi.spi));
}
const struct nu_modinit_s *modinit = get_modinit(obj->spi.spi, spi_modinit_tab); const struct nu_modinit_s *modinit = get_modinit(obj->spi.spi, spi_modinit_tab);
MBED_ASSERT(modinit != NULL); MBED_ASSERT(modinit != NULL);
@ -248,11 +267,19 @@ void spi_format(spi_t *obj, int bits, int mode, int slave)
SPI_DISABLE_SYNC(spi_base); SPI_DISABLE_SYNC(spi_base);
SPI_Open(spi_base, if (spi_is_qspi(obj)) {
slave ? SPI_SLAVE : SPI_MASTER, QSPI_Open((QSPI_T *) spi_base,
(mode == 0) ? SPI_MODE_0 : (mode == 1) ? SPI_MODE_1 : (mode == 2) ? SPI_MODE_2 : SPI_MODE_3, slave ? QSPI_SLAVE : QSPI_MASTER,
bits, (mode == 0) ? QSPI_MODE_0 : (mode == 1) ? QSPI_MODE_1 : (mode == 2) ? QSPI_MODE_2 : QSPI_MODE_3,
SPI_GetBusClock(spi_base)); bits,
QSPI_GetBusClock((QSPI_T *)spi_base));
} else {
SPI_Open(spi_base,
slave ? SPI_SLAVE : SPI_MASTER,
(mode == 0) ? SPI_MODE_0 : (mode == 1) ? SPI_MODE_1 : (mode == 2) ? SPI_MODE_2 : SPI_MODE_3,
bits,
SPI_GetBusClock(spi_base));
}
// NOTE: Hardcode to be MSB first. // NOTE: Hardcode to be MSB first.
SPI_SET_MSB_FIRST(spi_base); SPI_SET_MSB_FIRST(spi_base);
@ -281,7 +308,11 @@ void spi_frequency(spi_t *obj, int hz)
SPI_DISABLE_SYNC(spi_base); SPI_DISABLE_SYNC(spi_base);
SPI_SetBusClock((SPI_T *) NU_MODBASE(obj->spi.spi), hz); if (spi_is_qspi(obj)) {
QSPI_SetBusClock((QSPI_T *) NU_MODBASE(obj->spi.spi), hz);
} else {
SPI_SetBusClock((SPI_T *) NU_MODBASE(obj->spi.spi), hz);
}
} }
@ -617,6 +648,13 @@ uint8_t spi_active(spi_t *obj)
return vec ? 1 : 0; return vec ? 1 : 0;
} }
static int spi_is_qspi(spi_t *obj)
{
SPI_T *spi_base = (SPI_T *) NU_MODBASE(obj->spi.spi);
return (spi_base == ((SPI_T *) QSPI0));
}
static int spi_writeable(spi_t * obj) static int spi_writeable(spi_t * obj)
{ {
// Receive FIFO must not be full to avoid receive FIFO overflow on next transmit/receive // Receive FIFO must not be full to avoid receive FIFO overflow on next transmit/receive