Unverified Commit 3a2eb0b4 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: cs35l41: Use regmap_read_poll_timeout to wait for OTP boot 



Just clean up the code a little by using the helper rather than open
coding waiting for OTP_BOOT_DONE.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20210914141349.30218-2-ckeepax@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c2f14cc2

sound/soc/codecs/cs35l41.c

+8 −13
Original line number Diff line number Diff line
@@ -1323,7 +1323,6 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, 
{

	u32 regid, reg_revid, i, mtl_revid, int_status, chipid_match;

	int irq_pol = 0;

	int timeout;

	int ret;



	if (pdata) {
@@ -1377,18 +1376,14 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, 


	usleep_range(2000, 2100);



	timeout = 100;

	do {

		if (timeout == 0) {

	ret = regmap_read_poll_timeout(cs35l41->regmap, CS35L41_IRQ1_STATUS4,

				       int_status, int_status & CS35L41_OTP_BOOT_DONE,

				       1000, 100000);

	if (ret) {

		dev_err(cs35l41->dev,

				"Timeout waiting for OTP_BOOT_DONE\n");

			ret = -EBUSY;

			"Failed waiting for OTP_BOOT_DONE: %d\n", ret);

		goto err;

	}

		usleep_range(1000, 1100);

		regmap_read(cs35l41->regmap, CS35L41_IRQ1_STATUS4, &int_status);

		timeout--;

	} while (!(int_status & CS35L41_OTP_BOOT_DONE));



	regmap_read(cs35l41->regmap, CS35L41_IRQ1_STATUS3, &int_status);

	if (int_status & CS35L41_OTP_BOOT_ERR) {