lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "ASoC: ad1836: reset and restore clock control mode in suspend/resume entry"

Browse Source 
This reverts commit afe1c2cd71 since it
doesn't build.
This commit is contained in:
Mark Brown
2010-01-12 14:01:19 +00:00
parent 163849ea9b
commit 03e7a35c0e
1 changed files with 0 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
sound/soc/codecs/ad1836.c
View File

@@ -223,36 +223,6 @@ static unsigned int ad1836_read_reg_cache(struct snd_soc_codec *codec,
return reg_cache[reg]; return reg_cache[reg];
} }
#ifdef CONFIG_PM
static int ad1836_soc_suspend(struct platform_device *pdev,
pm_message_t state)
{
struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->card->codec;
/* reset clock control mode */
u16 adc_ctrl2 = codec->read(codec, AD1836_ADC_CTRL2);
adc_ctrl2 &= ~AD1836_ADC_SERFMT_MASK;
return codec->write(codec, AD1836_ADC_CTRL2, adc_ctrl2);
}
static int ad1836_soc_resume(struct platform_device *pdev)
{
struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->card->codec;
/* restore clock control mode */
u16 adc_ctrl2 = codec->read(codec, AD1836_ADC_CTRL2);
adc_ctrl2 |= AD1836_ADC_AUX;
return codec->write(codec, AD1836_ADC_CTRL2, adc_ctrl2);
}
#else
#define ad1836_soc_suspend NULL
#define ad1836_soc_resume NULL
#endif
static int __devinit ad1836_spi_probe(struct spi_device *spi) static int __devinit ad1836_spi_probe(struct spi_device *spi)
{ {
struct snd_soc_codec *codec; struct snd_soc_codec *codec;
@@ -434,8 +404,6 @@ static int ad1836_remove(struct platform_device *pdev)
struct snd_soc_codec_device soc_codec_dev_ad1836 = { struct snd_soc_codec_device soc_codec_dev_ad1836 = {
.probe = ad1836_probe, .probe = ad1836_probe,
.remove = ad1836_remove, .remove = ad1836_remove,
.suspend = ad1836_soc_suspend,
.resume = ad1836_soc_resume,
}; };
EXPORT_SYMBOL_GPL(soc_codec_dev_ad1836); EXPORT_SYMBOL_GPL(soc_codec_dev_ad1836);