Merge tag 'efi-2020-07-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / drivers / spi / nxp_fspi.c

diff --git a/drivers/spi/nxp_fspi.c b/drivers/spi/nxp_fspi.c
index a2fab7ad0a255bdc909a4fc994008315a2ac35d0..22a5c0e3c72e77991196ee6865c251ab9a68678e 100644 (file)
--- a/drivers/spi/nxp_fspi.c
+++ b/drivers/spi/nxp_fspi.c
@@ -44,6 +44,7 @@
 #include <linux/sizes.h>
 #include <linux/iopoll.h>
 #include <linux/bug.h>
+#include <linux/err.h>
 
 /*
  * The driver only uses one single LUT entry, that is updated on
@@ -420,7 +421,7 @@ static bool nxp_fspi_supports_op(struct spi_slave *slave,
        return true;
 }
 
-/* Instead of busy looping invoke readl_poll_timeout functionality. */
+/* Instead of busy looping invoke readl_poll_sleep_timeout functionality. */
 static int fspi_readl_poll_tout(struct nxp_fspi *f, void __iomem *base,
                                u32 mask, u32 delay_us,
                                u32 timeout_us, bool c)
@@ -431,11 +432,11 @@ static int fspi_readl_poll_tout(struct nxp_fspi *f, void __iomem *base,
                mask = (u32)cpu_to_be32(mask);
 
        if (c)
-               return readl_poll_timeout(base, reg, (reg & mask),
-                                         timeout_us);
+               return readl_poll_sleep_timeout(base, reg, (reg & mask),
+                                               delay_us, timeout_us);
        else
-               return readl_poll_timeout(base, reg, !(reg & mask),
-                                         timeout_us);
+               return readl_poll_sleep_timeout(base, reg, !(reg & mask),
+                                               delay_us, timeout_us);
 }
 
 /*