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

ASoC: rockchip: i2s: move pinctrl_pm_* to suspend/resume.

Browse Source 
some codec initializtion depends on i2s's mclk/lrck, when codec enter
deep sleep, codec power loss, then codec resume and reinit
codec logic which need mclk/lrck, if these clk is not ready, codec will
work abnormally.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
This commit is contained in:
Sugar Zhang
2015-07-10 16:27:25 +08:00
parent ff3fd603a0
commit fbe8dc221a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sound/soc/rockchip/rk_i2s.c
View File

@@ -483,7 +483,7 @@ static int rockchip_i2s_runtime_suspend(struct device *dev)
struct rk_i2s_dev *i2s = dev_get_drvdata(dev);
dev_dbg(i2s->dev, "%s\n", __func__);
return pinctrl_pm_select_sleep_state(dev);
return 0;
}
static int rockchip_i2s_runtime_resume(struct device *dev)
@@ -491,7 +491,7 @@ static int rockchip_i2s_runtime_resume(struct device *dev)
struct rk_i2s_dev *i2s = dev_get_drvdata(dev);
dev_dbg(i2s->dev, "%s\n", __func__);
return pinctrl_pm_select_default_state(dev);
return 0;
}
#else
#define i2s_runtime_suspend NULL
@@ -758,7 +758,7 @@ static int rockchip_i2s_suspend(struct device *dev)
struct rk_i2s_dev *i2s = dev_get_drvdata(dev);
dev_dbg(i2s->dev, "%s\n", __func__);
return 0;
return pinctrl_pm_select_sleep_state(dev);
}
static int rockchip_i2s_resume(struct device *dev)
@@ -767,6 +767,9 @@ static int rockchip_i2s_resume(struct device *dev)
int ret;
ret = pm_runtime_get_sync(dev);
if (ret < 0)
return ret;
ret = pinctrl_pm_select_default_state(dev);
if (ret < 0)
return ret;
ret = regmap_reinit_cache(i2s->regmap, &rockchip_i2s_regmap_config);