Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d955cba8 authored by Charles Keepax's avatar Charles Keepax Committed by Samuel Ortiz
Browse files

mfd: wm5102: Don't wait for boot when boot sequencer is disabled



As we are using a custom boot sequence we don't need to wait for the
standard boot sequence in device init when the normal write sequence is
disabled.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent c25feaa5
Loading
Loading
Loading
Loading
+18 −4
Original line number Diff line number Diff line
@@ -600,11 +600,25 @@ int arizona_dev_init(struct arizona *arizona)
		}
	}

	switch (arizona->type) {
	case WM5102:
		ret = regmap_read(arizona->regmap, 0x19, &val);
		if (ret != 0)
			dev_err(dev,
				"Failed to check write sequencer state: %d\n",
				ret);
		else if (val & 0x01)
			break;
		/* Fall through */
	default:
		ret = arizona_wait_for_boot(arizona);
		if (ret != 0) {
		dev_err(arizona->dev, "Device failed initial boot: %d\n", ret);
			dev_err(arizona->dev,
				"Device failed initial boot: %d\n", ret);
			goto err_reset;
		}
		break;
	}

	if (apply_patch) {
		ret = apply_patch(arizona);