Unverified Commit fbb0ec65 authored by Judy Hsiao's avatar Judy Hsiao Committed by Mark Brown
Browse files

ASoC: rockchip: i2s: use regmap_read_poll_timeout to poll I2S_CLR 



Use regmap_read_poll_timeout to poll I2S_CLR.
It also fixes the 'rockchip-i2s ff070000.i2s; fail to clear' when
the read of I2S_CLR exceeds the retry limit.

Fixes: 0ff9f8b9 ("ASoC: rockchip: i2s: Fix error code when fail to read I2S_CLR")
Signed-off-by: default avatarJudy Hsiao <judyhsiao@chromium.org>
Reviewed-by: default avatarBrian Norris <briannorris@chromium.org>
Link: https://lore.kernel.org/r/20220914031234.2250298-1-judyhsiao@chromium.org


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

sound/soc/rockchip/rockchip_i2s.c

+16 −25
Original line number Diff line number Diff line
@@ -126,7 +126,6 @@ static inline struct rk_i2s_dev *to_info(struct snd_soc_dai *dai) 
static int rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on)

{

	unsigned int val = 0;

	int retry = 10;

	int ret = 0;



	spin_lock(&i2s->lock);
@@ -163,18 +162,14 @@ static int rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on) 
						 I2S_CLR_TXC | I2S_CLR_RXC);

			if (ret < 0)

				goto end;

			regmap_read(i2s->regmap, I2S_CLR, &val);



			/* Should wait for clear operation to finish */

			while (val) {

				regmap_read(i2s->regmap, I2S_CLR, &val);

				retry--;

				if (!retry) {

					dev_warn(i2s->dev, "fail to clear\n");

					ret = -EBUSY;

					break;

				}

			}

			ret = regmap_read_poll_timeout(i2s->regmap,

						       I2S_CLR,

						       val,

						       val != 0,

						       20,

						       200);

			if (ret < 0)

				dev_warn(i2s->dev, "fail to clear: %d\n", ret);

		}

	}

end:
@@ -188,7 +183,6 @@ static int rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on) 
static int rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on)

{

	unsigned int val = 0;

	int retry = 10;

	int ret = 0;



	spin_lock(&i2s->lock);
@@ -226,17 +220,14 @@ static int rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on) 
						 I2S_CLR_TXC | I2S_CLR_RXC);

			if (ret < 0)

				goto end;

			regmap_read(i2s->regmap, I2S_CLR, &val);

			/* Should wait for clear operation to finish */

			while (val) {

				regmap_read(i2s->regmap, I2S_CLR, &val);

				retry--;

				if (!retry) {

					dev_warn(i2s->dev, "fail to clear\n");

					ret = -EBUSY;

					break;

				}

			}

			ret = regmap_read_poll_timeout(i2s->regmap,

						       I2S_CLR,

						       val,

						       val != 0,

						       20,

						       200);

			if (ret < 0)

				dev_warn(i2s->dev, "fail to clear: %d\n", ret);

		}

	}

end: