|
@@ -33,6 +33,7 @@
|
|
|
#include <linux/of.h>
|
|
|
#include <linux/of_device.h>
|
|
|
#include <linux/gcd.h>
|
|
|
+#include <linux/iopoll.h>
|
|
|
|
|
|
#include <linux/spi/spi.h>
|
|
|
#include <linux/gpio.h>
|
|
@@ -353,19 +354,9 @@ disable_fifo:
|
|
|
|
|
|
static int mcspi_wait_for_reg_bit(void __iomem *reg, unsigned long bit)
|
|
|
{
|
|
|
- unsigned long timeout;
|
|
|
-
|
|
|
- timeout = jiffies + msecs_to_jiffies(1000);
|
|
|
- while (!(readl_relaxed(reg) & bit)) {
|
|
|
- if (time_after(jiffies, timeout)) {
|
|
|
- if (!(readl_relaxed(reg) & bit))
|
|
|
- return -ETIMEDOUT;
|
|
|
- else
|
|
|
- return 0;
|
|
|
- }
|
|
|
- cpu_relax();
|
|
|
- }
|
|
|
- return 0;
|
|
|
+ u32 val;
|
|
|
+
|
|
|
+ return readl_poll_timeout(reg, val, val & bit, 1, MSEC_PER_SEC);
|
|
|
}
|
|
|
|
|
|
static void omap2_mcspi_rx_callback(void *data)
|