This patch brings i2s back to normal by resetting i2s m/h
when the soft reset failed.
Signed-off-by: Sugar Zhang <sugar.zhang@xxxxxxxxxxxxxx>
---
Changes in v3: None
Changes in v2: None
sound/soc/rockchip/rockchip_i2s.c | 29 +++++++++++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index 0ba728f..78321ee 100644
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -15,6 +15,7 @@
#include <linux/clk.h>
#include <linux/pm_runtime.h>
#include <linux/regmap.h>
+#include <linux/reset.h>
#include <linux/spinlock.h>
#include <sound/pcm_params.h>
#include <sound/dmaengine_pcm.h>
@@ -40,6 +41,8 @@ struct rk_i2s_dev {
struct regmap *regmap;
struct regmap *grf;
+ struct reset_control *reset_m;
+ struct reset_control *reset_h;
/*
* Used to indicate the tx/rx status.
@@ -92,6 +95,20 @@ static inline struct rk_i2s_dev *to_info(struct snd_soc_dai *dai)
return snd_soc_dai_get_drvdata(dai);
}
+static void rockchip_i2s_reset(struct rk_i2s_dev *i2s)
+{
+ dev_warn(i2s->dev, "Reset controller.\n");
+
+ reset_control_assert(i2s->reset_m);
+ reset_control_assert(i2s->reset_h);
+ udelay(1);
+ reset_control_deassert(i2s->reset_m);
+ reset_control_deassert(i2s->reset_h);
+
+ regcache_mark_dirty(i2s->regmap);
+ regcache_sync(i2s->regmap);
+}
+
static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on)
{
unsigned int val = 0;
@@ -132,7 +149,7 @@ static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on)
regmap_read(i2s->regmap, I2S_CLR, &val);
retry--;
if (!retry) {
- dev_warn(i2s->dev, "fail to clear\n");
+ rockchip_i2s_reset(i2s);
break;
}
}
@@ -181,7 +198,7 @@ static void rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on)
regmap_read(i2s->regmap, I2S_CLR, &val);
retry--;
if (!retry) {
- dev_warn(i2s->dev, "fail to clear\n");
+ rockchip_i2s_reset(i2s);
break;
}
}
@@ -629,6 +646,14 @@ static int rockchip_i2s_probe(struct platform_device *pdev)
i2s->pins = of_id->data;
}
+ i2s->reset_m = devm_reset_control_get_optional(&pdev->dev, "reset-m");
+ if (IS_ERR(i2s->reset_m))
+ return PTR_ERR(i2s->reset_m);
+
+ i2s->reset_h = devm_reset_control_get_optional(&pdev->dev, "reset-h");
+ if (IS_ERR(i2s->reset_h))
+ return PTR_ERR(i2s->reset_h);
+
/* try to prepare related clocks */
i2s->hclk = devm_clk_get(&pdev->dev, "i2s_hclk");
if (IS_ERR(i2s->hclk)) {
--
2.7.4
