diff options
| author | Inha Song <ideal.song@samsung.com> | 2015-02-26 17:34:48 +0900 |
|---|---|---|
| committer | Seung-Woo Kim <sw0312.kim@samsung.com> | 2016-12-14 13:42:43 +0900 |
| commit | 0943ccf86491beea5667b050ab869846a1ed9d4b (patch) | |
| tree | e8b5e5d4b24b78e7190fb1f126cca7118d02b91e /sound | |
| parent | 1ad4ce7302704411a7c28e7302bee63ef48f2c37 (diff) | |
LOCAL / ASoC: samsung: Change variable names to codec_mclk1
This patch chagne variable names to codec_mclk1 from codec_mclk.
WM5110 codec have two mclk for FLL1 and FLL2 source.
So we should distinguish variable name for that two mclk.
Signed-off-by: Inha Song <ideal.song@samsung.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/samsung/tm2_wm5110.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/samsung/tm2_wm5110.c b/sound/soc/samsung/tm2_wm5110.c index 62ac0168db7d..13177b6e5443 100644 --- a/sound/soc/samsung/tm2_wm5110.c +++ b/sound/soc/samsung/tm2_wm5110.c @@ -24,7 +24,7 @@ struct tm2_machine_priv { struct snd_soc_codec *codec; - struct clk *codec_mclk; + struct clk *codec_mclk1; int mic_bias; }; @@ -40,7 +40,7 @@ static int tm2_aif1_hw_params(struct snd_pcm_substream *substream, snd_soc_card_get_drvdata(rtd->card); unsigned int sysclk_rate; unsigned int mclk_rate = - (unsigned int)clk_get_rate(priv->codec_mclk); + (unsigned int)clk_get_rate(priv->codec_mclk1); int ret; dev_dbg(codec->dev, "params_rate: %d\n", params_rate(params)); @@ -120,7 +120,7 @@ static int tm2_aif1_startup(struct snd_pcm_substream *substream) struct tm2_machine_priv *priv = snd_soc_card_get_drvdata(rtd->card); int ret; - ret = clk_prepare_enable(priv->codec_mclk); + ret = clk_prepare_enable(priv->codec_mclk1); if (ret) { dev_err(rtd->card->dev, "Failed to enable mclk: %d\n", ret); return ret; @@ -134,7 +134,7 @@ static void tm2_aif1_shutdown(struct snd_pcm_substream *substream) struct snd_soc_pcm_runtime *rtd = substream->private_data; struct tm2_machine_priv *priv = snd_soc_card_get_drvdata(rtd->card); - clk_disable_unprepare(priv->codec_mclk); + clk_disable_unprepare(priv->codec_mclk1); } static struct snd_soc_ops tm2_aif1_ops = { @@ -273,10 +273,10 @@ static int tm2_wm5110_probe(struct platform_device *pdev) dai_link[i].platform_of_node = dai_link[i].cpu_of_node; } - priv->codec_mclk = devm_clk_get(&pdev->dev, "mclk"); - if (IS_ERR(priv->codec_mclk)) { + priv->codec_mclk1 = devm_clk_get(&pdev->dev, "mclk1"); + if (IS_ERR(priv->codec_mclk1)) { dev_err(&pdev->dev, "Failed to get out clock\n"); - return PTR_ERR(priv->codec_mclk); + return PTR_ERR(priv->codec_mclk1); } priv->mic_bias = of_get_named_gpio(np, "mic_bias_gpio", 0); |