shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 21:07:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: rockchip: i2s: Fix FIFO clear error on SLAVE mode

Browse Source 
Workaround for FIFO clear on SLAVE mode:

A Suggest to do reset hclk domain and then do mclk
  domain, especially for SLAVE mode without CLK in.
  at last, recovery regmap config.

B Suggest to switch to MASTER, and then do FIFO clr,
  at last, bring back to SLAVE.

Now we choose plan B here.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I1884659df7fa9052477652b7b0315da21e3165c2
This commit is contained in:
Sugar Zhang
2023-02-28 23:37:30 +08:00
committed by Tao Huang
parent 3d084c2144
commit 309faf4a9c
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sound/soc/rockchip/rockchip_i2s.c
View File

@@ -99,12 +99,31 @@ static int rockchip_i2s_clear(struct rk_i2s_dev *i2s)
unsigned int val = 0;
int ret;
/*
* Workaround for FIFO clear on SLAVE mode:
*
* A Suggest to do reset hclk domain and then do mclk
* domain, especially for SLAVE mode without CLK in.
* at last, recovery regmap config.
*
* B Suggest to switch to MASTER, and then do FIFO clr,
* at last, bring back to SLAVE.
*
* Now we choose plan B here.
*/
if (!i2s->is_master_mode)
regmap_update_bits(i2s->regmap, I2S_CKR,
I2S_CKR_MSS_MASK, I2S_CKR_MSS_MASTER);
regmap_update_bits(i2s->regmap, I2S_CLR, clr, clr);
ret = regmap_read_poll_timeout_atomic(i2s->regmap, I2S_CLR, val,
!(val & clr), 10, 100);
if (!i2s->is_master_mode)
regmap_update_bits(i2s->regmap, I2S_CKR,
I2S_CKR_MSS_MASK, I2S_CKR_MSS_SLAVE);
if (ret < 0)
dev_warn(i2s->dev, "fail to clear\n");
dev_warn(i2s->dev, "failed to clear fifo on %s mode\n",
i2s->is_master_mode ? "master" : "slave");
return ret;
}