ASoC: rockchip: pdm: Fix record error at the 2nd time

XiaoTan Luo · rkhuangtao · commit ce0d012e7971 · 2022-05-07T14:27:51.000+08:00
Signed-off-by: XiaoTan Luo &lt;lxt@rock-chips.com&gt;
Change-Id: Ifd239c8a467fc4d77ff354ff724d9bb83db046ce
diff --git a/sound/soc/rockchip/rockchip_pdm.c b/sound/soc/rockchip/rockchip_pdm.c
@@ -418,6 +418,7 @@ static int rockchip_pdm_runtime_suspend(struct device *dev)
 {
 	struct rk_pdm_dev *pdm = dev_get_drvdata(dev);
 
+	regcache_cache_only(pdm->regmap, true);
 	clk_disable_unprepare(pdm->clk);
 	clk_disable_unprepare(pdm->hclk);
 
@@ -441,6 +442,13 @@ static int rockchip_pdm_runtime_resume(struct device *dev)
 		return ret;
 	}
 
+	regcache_cache_only(pdm->regmap, false);
+	regcache_mark_dirty(pdm->regmap);
+	ret = regcache_sync(pdm->regmap);
+	if (ret) {
+		clk_disable_unprepare(pdm->clk);
+		clk_disable_unprepare(pdm->hclk);
+	}
 	return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -418,6 +418,7 @@ static int rockchip_pdm_runtime_suspend(struct device *dev)`
`418`	`418`	`{`
`419`	`419`	`struct rk_pdm_dev *pdm = dev_get_drvdata(dev);`
`420`	`420`
	`421`	`+ regcache_cache_only(pdm->regmap, true);`
`421`	`422`	`clk_disable_unprepare(pdm->clk);`
`422`	`423`	`clk_disable_unprepare(pdm->hclk);`
`423`	`424`
`@@ -441,6 +442,13 @@ static int rockchip_pdm_runtime_resume(struct device *dev)`
`441`	`442`	`return ret;`
`442`	`443`	`}`
`443`	`444`
	`445`	`+ regcache_cache_only(pdm->regmap, false);`
	`446`	`+ regcache_mark_dirty(pdm->regmap);`
	`447`	`+ ret = regcache_sync(pdm->regmap);`
	`448`	`+ if (ret) {`
	`449`	`+ clk_disable_unprepare(pdm->clk);`
	`450`	`+ clk_disable_unprepare(pdm->hclk);`
	`451`	`+ }`
`444`	`452`	`return 0;`
`445`	`453`	`}`
`446`	`454`