forked from luck/tmp_suning_uos_patched
ASoC: TWL4030: Do not modify the APLL_CTL register
APLL_CTL register is configured by the twl4030-codec MFD driver. Remove code, which makes changes in the APLL_CTL register, and replace those with checks against the configured audio_mclk configuration done in the MFD driver. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
0969afcc44
commit
68d019553b
|
@ -214,7 +214,8 @@ static void twl4030_init_chip(struct snd_soc_codec *codec)
|
|||
|
||||
/* set all audio section registers to reasonable defaults */
|
||||
for (i = TWL4030_REG_OPTION; i <= TWL4030_REG_MISC_SET_2; i++)
|
||||
twl4030_write(codec, i, cache[i]);
|
||||
if (i != TWL4030_REG_APLL_CTL)
|
||||
twl4030_write(codec, i, cache[i]);
|
||||
|
||||
}
|
||||
|
||||
|
@ -1753,30 +1754,23 @@ static int twl4030_set_dai_sysclk(struct snd_soc_dai *codec_dai,
|
|||
{
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct twl4030_priv *twl4030 = codec->private_data;
|
||||
u8 apll_ctrl;
|
||||
|
||||
apll_ctrl = twl4030_read_reg_cache(codec, TWL4030_REG_APLL_CTL);
|
||||
apll_ctrl &= ~TWL4030_APLL_INFREQ;
|
||||
switch (freq) {
|
||||
case 19200000:
|
||||
apll_ctrl |= TWL4030_APLL_INFREQ_19200KHZ;
|
||||
twl4030->sysclk = 19200;
|
||||
break;
|
||||
case 26000000:
|
||||
apll_ctrl |= TWL4030_APLL_INFREQ_26000KHZ;
|
||||
twl4030->sysclk = 26000;
|
||||
break;
|
||||
case 38400000:
|
||||
apll_ctrl |= TWL4030_APLL_INFREQ_38400KHZ;
|
||||
twl4030->sysclk = 38400;
|
||||
break;
|
||||
default:
|
||||
printk(KERN_ERR "TWL4030 set sysclk: unknown rate %d\n",
|
||||
freq);
|
||||
dev_err(codec->dev, "Unsupported APLL mclk: %u\n", freq);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
twl4030_write(codec, TWL4030_REG_APLL_CTL, apll_ctrl);
|
||||
if ((freq / 1000) != twl4030->sysclk) {
|
||||
dev_err(codec->dev,
|
||||
"Mismatch in APLL mclk: %u (configured: %u)\n",
|
||||
freq, twl4030->sysclk * 1000);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -1874,18 +1868,16 @@ static int twl4030_voice_startup(struct snd_pcm_substream *substream,
|
|||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||
struct snd_soc_device *socdev = rtd->socdev;
|
||||
struct snd_soc_codec *codec = socdev->card->codec;
|
||||
u8 infreq;
|
||||
struct twl4030_priv *twl4030 = codec->private_data;
|
||||
u8 mode;
|
||||
|
||||
/* If the system master clock is not 26MHz, the voice PCM interface is
|
||||
* not avilable.
|
||||
*/
|
||||
infreq = twl4030_read_reg_cache(codec, TWL4030_REG_APLL_CTL)
|
||||
& TWL4030_APLL_INFREQ;
|
||||
|
||||
if (infreq != TWL4030_APLL_INFREQ_26000KHZ) {
|
||||
printk(KERN_ERR "TWL4030 voice startup: "
|
||||
"MCLK is not 26MHz, call set_sysclk() on init\n");
|
||||
if (twl4030->sysclk != 26000) {
|
||||
dev_err(codec->dev, "The board is configured for %u Hz, while"
|
||||
"the Voice interface needs 26MHz APLL mclk\n",
|
||||
twl4030->sysclk * 1000);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
@ -1958,22 +1950,19 @@ static int twl4030_voice_set_dai_sysclk(struct snd_soc_dai *codec_dai,
|
|||
int clk_id, unsigned int freq, int dir)
|
||||
{
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
u8 apll_ctrl;
|
||||
struct twl4030_priv *twl4030 = codec->private_data;
|
||||
|
||||
apll_ctrl = twl4030_read_reg_cache(codec, TWL4030_REG_APLL_CTL);
|
||||
apll_ctrl &= ~TWL4030_APLL_INFREQ;
|
||||
switch (freq) {
|
||||
case 26000000:
|
||||
apll_ctrl |= TWL4030_APLL_INFREQ_26000KHZ;
|
||||
break;
|
||||
default:
|
||||
printk(KERN_ERR "TWL4030 voice set sysclk: unknown rate %d\n",
|
||||
freq);
|
||||
if (freq != 26000000) {
|
||||
dev_err(codec->dev, "Unsupported APLL mclk: %u, the Voice"
|
||||
"interface needs 26MHz APLL mclk\n", freq);
|
||||
return -EINVAL;
|
||||
}
|
||||
if ((freq / 1000) != twl4030->sysclk) {
|
||||
dev_err(codec->dev,
|
||||
"Mismatch in APLL mclk: %u (configured: %u)\n",
|
||||
freq, twl4030->sysclk * 1000);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
twl4030_write(codec, TWL4030_REG_APLL_CTL, apll_ctrl);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -2131,17 +2120,15 @@ static int twl4030_soc_probe(struct platform_device *pdev)
|
|||
if (setup) {
|
||||
unsigned char hs_pop;
|
||||
|
||||
if (setup->sysclk)
|
||||
twl4030->sysclk = setup->sysclk;
|
||||
else
|
||||
twl4030->sysclk = 26000;
|
||||
if (setup->sysclk != twl4030->sysclk)
|
||||
dev_warn(&pdev->dev,
|
||||
"Mismatch in APLL mclk: %u (configured: %u)\n",
|
||||
setup->sysclk, twl4030->sysclk);
|
||||
|
||||
hs_pop = twl4030_read_reg_cache(codec, TWL4030_REG_HS_POPN_SET);
|
||||
hs_pop &= ~TWL4030_RAMP_DELAY;
|
||||
hs_pop |= (setup->ramp_delay_value << 2);
|
||||
twl4030_write_reg_cache(codec, TWL4030_REG_HS_POPN_SET, hs_pop);
|
||||
} else {
|
||||
twl4030->sysclk = 26000;
|
||||
}
|
||||
|
||||
/* register pcms */
|
||||
|
@ -2179,10 +2166,8 @@ static int __devinit twl4030_codec_probe(struct platform_device *pdev)
|
|||
struct twl4030_priv *twl4030;
|
||||
int ret;
|
||||
|
||||
if (!pdata || !(pdata->audio_mclk == 19200000 ||
|
||||
pdata->audio_mclk == 26000000 ||
|
||||
pdata->audio_mclk == 38400000)) {
|
||||
dev_err(&pdev->dev, "Invalid platform_data\n");
|
||||
if (!pdata) {
|
||||
dev_err(&pdev->dev, "platform_data is missing\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
@ -2221,6 +2206,7 @@ static int __devinit twl4030_codec_probe(struct platform_device *pdev)
|
|||
twl4030_codec = codec;
|
||||
|
||||
/* Set the defaults, and power up the codec */
|
||||
twl4030->sysclk = twl4030_codec_get_mclk() / 1000;
|
||||
twl4030_init_chip(codec);
|
||||
codec->bias_level = SND_SOC_BIAS_OFF;
|
||||
twl4030_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
|
||||
|
|
Loading…
Reference in New Issue
Block a user