Factor out the polling of the interrupt status register whilst we wait
for boot done to allow the polling to be reused in other situations.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-static int arizona_wait_for_boot(struct arizona *arizona)
+static int arizona_poll_reg(struct arizona *arizona,
+ int timeout, unsigned int reg,
+ unsigned int mask, unsigned int target)
- /*
- * We can't use an interrupt as we need to runtime resume to do so,
- * we won't race with the interrupt handler as it'll be blocked on
- * runtime resume.
- */
- for (i = 0; i < 5; i++) {
- msleep(1);
-
- ret = regmap_read(arizona->regmap,
- ARIZONA_INTERRUPT_RAW_STATUS_5, ®);
+ for (i = 0; i < timeout; i++) {
+ ret = regmap_read(arizona->regmap, reg, &val);
- dev_err(arizona->dev, "Failed to read boot state: %d\n",
- ret);
+ dev_err(arizona->dev, "Failed to read reg %u: %d\n",
+ reg, ret);
- if (reg & ARIZONA_BOOT_DONE_STS)
- break;
+ if ((val & mask) == target)
+ return 0;
+
+ msleep(1);
- if (reg & ARIZONA_BOOT_DONE_STS) {
+ dev_err(arizona->dev, "Polling reg %u timed out: %x\n", reg, val);
+ return -ETIMEDOUT;
+}
+
+static int arizona_wait_for_boot(struct arizona *arizona)
+{
+ int ret;
+
+ /*
+ * We can't use an interrupt as we need to runtime resume to do so,
+ * we won't race with the interrupt handler as it'll be blocked on
+ * runtime resume.
+ */
+ ret = arizona_poll_reg(arizona, 5, ARIZONA_INTERRUPT_RAW_STATUS_5,
+ ARIZONA_BOOT_DONE_STS, ARIZONA_BOOT_DONE_STS);
+
+ if (!ret)
regmap_write(arizona->regmap, ARIZONA_INTERRUPT_STATUS_5,
ARIZONA_BOOT_DONE_STS);
regmap_write(arizona->regmap, ARIZONA_INTERRUPT_STATUS_5,
ARIZONA_BOOT_DONE_STS);
- } else {
- dev_err(arizona->dev, "Device boot timed out: %x\n", reg);
- return -ETIMEDOUT;
- }
pm_runtime_mark_last_busy(arizona->dev);
pm_runtime_mark_last_busy(arizona->dev);
}
#ifdef CONFIG_PM_RUNTIME
}
#ifdef CONFIG_PM_RUNTIME