GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-31 03:21:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

spi: fsl_qspi: Introduce is_controller_busy function

Browse source 
Some SoCs have different endianness of QSPI IP if compared
to endianness of core. The function is_controller_busy()
checks if the QSPI controller is busy or not, considering
the endianness of the QSPI IP.

Signed-off-by: Rajat Srivastava <rajat.srivastava@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
This commit is contained in:
Rajat Srivastava 2018-03-22 13:30:55 +05:30 • committed by York Sun
parent a43d46a73c
commit 1f55356411
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
drivers/spi/fsl_qspi.c
View file

@ -155,6 +155,25 @@ static void qspi_write32(u32 flags, u32 *addr, u32 val)
out_be32(addr, val) : out_le32(addr, val); out_be32(addr, val) : out_le32(addr, 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 int retry = 5;
do {
val = qspi_read32(priv->flags, &priv->regs->sr);
if ((~val & mask) == mask)
return 0;
udelay(1);
} while (--retry);
return -ETIMEDOUT;
}
/* QSPI support swapping the flash read/write data /* QSPI support swapping the flash read/write data
* in hardware for LS102xA, but not for VF610 */ * in hardware for LS102xA, but not for VF610 */
static inline u32 qspi_endian_xchg(u32 data) static inline u32 qspi_endian_xchg(u32 data)
@ -1017,11 +1036,7 @@ static int fsl_qspi_probe(struct udevice *bus)
priv->num_chipselect = plat->num_chipselect; priv->num_chipselect = plat->num_chipselect;
/* make sure controller is not busy anywhere */ /* make sure controller is not busy anywhere */
ret = wait_for_bit_le32(&priv->regs->sr, ret = is_controller_busy(priv);
QSPI_SR_BUSY_MASK |
QSPI_SR_AHB_ACC_MASK |
QSPI_SR_IP_ACC_MASK,
false, 100, false);
if (ret) { if (ret) {
debug("ERROR : The controller is busy\n"); debug("ERROR : The controller is busy\n");
@ -1184,11 +1199,7 @@ static int fsl_qspi_claim_bus(struct udevice *dev)
priv = dev_get_priv(bus); priv = dev_get_priv(bus);
/* make sure controller is not busy anywhere */ /* make sure controller is not busy anywhere */
ret = wait_for_bit_le32(&priv->regs->sr, ret = is_controller_busy(priv);
QSPI_SR_BUSY_MASK |
QSPI_SR_AHB_ACC_MASK |
QSPI_SR_IP_ACC_MASK,
false, 100, false);
if (ret) { if (ret) {
debug("ERROR : The controller is busy\n"); debug("ERROR : The controller is busy\n");