shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: rockchip: i2s_tdm: Add reset mechanism

Browse Source 
This patch brings i2s back to normal by resetting i2s tx/rx
relative logic if i2s' clear operation is failed.

Change-Id: I52e4713d26f781962278802bd1f9bbce3fe4b751
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
This commit is contained in:
Sugar Zhang
2018-11-28 20:10:53 +08:00
committed by Tao Huang
parent dc6c729aa1
commit 013ace76f0
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sound/soc/rockchip/rockchip_i2s_tdm.c
View File

@@ -308,7 +308,8 @@ static void rockchip_snd_txrxctrl(struct snd_pcm_substream *substream,
regmap_read(i2s_tdm->regmap, I2S_CLR, &val);
retry--;
if (!retry) {
dev_info(i2s_tdm->dev, "fail to clear\n");
dev_info(i2s_tdm->dev, "reset txrx\n");
rockchip_snd_xfer_sync_reset(i2s_tdm);
break;
}
}
@@ -349,7 +350,10 @@ static void rockchip_snd_txctrl(struct rk_i2s_tdm_dev *i2s_tdm, int on)
regmap_read(i2s_tdm->regmap, I2S_CLR, &val);
retry--;
if (!retry) {
dev_warn(i2s_tdm->dev, "fail to clear\n");
dev_warn(i2s_tdm->dev, "reset tx\n");
reset_control_assert(i2s_tdm->tx_reset);
udelay(1);
reset_control_deassert(i2s_tdm->tx_reset);
break;
}
}
@@ -388,7 +392,10 @@ static void rockchip_snd_rxctrl(struct rk_i2s_tdm_dev *i2s_tdm, int on)
regmap_read(i2s_tdm->regmap, I2S_CLR, &val);
retry--;
if (!retry) {
dev_warn(i2s_tdm->dev, "fail to clear\n");
dev_warn(i2s_tdm->dev, "reset rx\n");
reset_control_assert(i2s_tdm->rx_reset);
udelay(1);
reset_control_deassert(i2s_tdm->rx_reset);
break;
}
}
@@ -568,7 +575,8 @@ static void rockchip_i2s_tdm_xfer_pause(struct snd_pcm_substream *substream,
regmap_read(i2s_tdm->regmap, I2S_CLR, &val);
retry--;
if (!retry) {
dev_info(i2s_tdm->dev, "fail to clear\n");
dev_info(i2s_tdm->dev, "reset txrx\n");
rockchip_snd_xfer_sync_reset(i2s_tdm);
break;
}
}