random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-11-24 20:58:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

drivers/spi: fsl_qspi: improve timeout calculation

Browse Source 
Use readl_poll_timeout instead of explicit calculation

Signed-off-by: Thomas Schaefer <thomas.schaefer@kontron.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
This commit is contained in:
Thomas Schaefer 2019-07-01 17:37:35 +02:00 committed by Jagan Teki
parent c6d0c5eb30
commit 733391e84b
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/spi/fsl_qspi.c
View File

@ -10,6 +10,7 @@
#include <spi.h>
#include <asm/io.h>
#include <linux/sizes.h>
#include <linux/iopoll.h>
#include <dm.h>
#include <errno.h>
#include <watchdog.h>
@ -150,19 +151,13 @@ static void qspi_write32(u32 flags, u32 *addr, u32 val)
static inline int is_controller_busy(const struct fsl_qspi_priv *priv)
{
u32 val;
const u32 mask = QSPI_SR_BUSY_MASK | QSPI_SR_AHB_ACC_MASK |
QSPI_SR_IP_ACC_MASK;
unsigned long timeout = timer_get_us() + 1000;
u32 mask = QSPI_SR_BUSY_MASK | QSPI_SR_AHB_ACC_MASK |
QSPI_SR_IP_ACC_MASK;
do {
val = qspi_read32(priv->flags, &priv->regs->sr);
if (priv->flags & QSPI_FLAG_REGMAP_ENDIAN_BIG)
mask = (u32)cpu_to_be32(mask);
if ((~val & mask) == mask)
return 0;
if (timer_get_us() > timeout )
return -ETIMEDOUT;
} while (1);
return readl_poll_timeout(&priv->regs->sr, val, !(val & mask), 1000);
}
/* QSPI support swapping the flash read/write data