summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorJianqun <jay.xu@rock-chips.com>2014-09-13 02:43:13 +0200
committerMark Brown <broonie@kernel.org>2014-09-13 18:36:54 +0200
commit01605ad12875c7b5ed71b486f9badb338f4f8c21 (patch)
treed9ae6e0a99517651d1e6c3dbc29577ab51e68790 /sound
parentLinux 3.17-rc1 (diff)
downloadlinux-01605ad12875c7b5ed71b486f9badb338f4f8c21.tar.xz
linux-01605ad12875c7b5ed71b486f9badb338f4f8c21.zip
ASoC: rockchip-i2s: enable "hclk" for rockchip I2S controller
As "hclk" is used for rockchip I2S controller, driver must to enable it in probe. Tested on RK3288 with max98090. Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/rockchip/rockchip_i2s.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index 8d8e4b59049f..dd423c611d96 100644
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -419,6 +419,11 @@ static int rockchip_i2s_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "Can't retrieve i2s bus clock\n");
return PTR_ERR(i2s->hclk);
}
+ ret = clk_prepare_enable(i2s->hclk);
+ if (ret) {
+ dev_err(i2s->dev, "hclock enable failed %d\n", ret);
+ return ret;
+ }
i2s->mclk = devm_clk_get(&pdev->dev, "i2s_clk");
if (IS_ERR(i2s->mclk)) {