diff options
| author | Peter Ujfalusi | 2015-06-04 15:04:20 +0200 |
|---|---|---|
| committer | Mark Brown | 2015-06-04 18:50:03 +0200 |
| commit | 16bd395259cf3e9966d40478891e0e610da109d4 (patch) | |
| tree | 6b606554b6144aa7ecce151ca92ce55a63028f23 /sound/soc/codecs/tas2552.c | |
| parent | ASoC: tas2552: Simplify and reverse the functionality of tas2552_sw_shutdown (diff) | |
| download | kernel-qcow2-linux-16bd395259cf3e9966d40478891e0e610da109d4.tar.gz kernel-qcow2-linux-16bd395259cf3e9966d40478891e0e610da109d4.tar.xz kernel-qcow2-linux-16bd395259cf3e9966d40478891e0e610da109d4.zip | |
ASoC: tas2552: Rename mclk parameter to pll_clkin to match with the datasheet
MCLK is one of the possible source for the pll_clkin frequency. Make this
clear by renaming the variable.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/tas2552.c')
| -rw-r--r-- | sound/soc/codecs/tas2552.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/codecs/tas2552.c b/sound/soc/codecs/tas2552.c index 61419e2f833b..e29b29b279d9 100644 --- a/sound/soc/codecs/tas2552.c +++ b/sound/soc/codecs/tas2552.c @@ -75,7 +75,7 @@ struct tas2552_data { struct regulator_bulk_data supplies[TAS2552_NUM_SUPPLIES]; struct gpio_desc *enable_gpio; unsigned char regs[TAS2552_VBAT_DATA]; - unsigned int mclk; + unsigned int pll_clkin; }; /* Input mux controls */ @@ -141,13 +141,13 @@ static int tas2552_hw_params(struct snd_pcm_substream *substream, int d; u8 p, j; - if (!tas2552->mclk) + if (!tas2552->pll_clkin) return -EINVAL; snd_soc_update_bits(codec, TAS2552_CFG_2, TAS2552_PLL_ENABLE, 0); - if (tas2552->mclk == TAS2552_245MHZ_CLK || - tas2552->mclk == TAS2552_225MHZ_CLK) { + if (tas2552->pll_clkin == TAS2552_245MHZ_CLK || + tas2552->pll_clkin == TAS2552_225MHZ_CLK) { /* By pass the PLL configuration */ snd_soc_update_bits(codec, TAS2552_PLL_CTRL_2, TAS2552_PLL_BYPASS_MASK, @@ -171,8 +171,8 @@ static int tas2552_hw_params(struct snd_pcm_substream *substream, return -EINVAL; } - j = (pll_clk * 2 * (1 << p)) / tas2552->mclk; - d = (pll_clk * 2 * (1 << p)) % tas2552->mclk; + j = (pll_clk * 2 * (1 << p)) / tas2552->pll_clkin; + d = (pll_clk * 2 * (1 << p)) % tas2552->pll_clkin; snd_soc_update_bits(codec, TAS2552_PLL_CTRL_1, TAS2552_PLL_J_MASK, j); @@ -245,7 +245,7 @@ static int tas2552_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id, struct snd_soc_codec *codec = dai->codec; struct tas2552_data *tas2552 = dev_get_drvdata(codec->dev); - tas2552->mclk = freq; + tas2552->pll_clkin = freq; return 0; } |