aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-12 09:01:19 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-12 09:01:19 -0500
commit03e7a35c0ef7a462385fb6a301dfc1b287cac6de (patch)
tree9dc60a9b6c6d0d083dea640d0ae37136f8c4314d /sound
parent163849ea9b4c5d50fbd324692461983d18faadad (diff)
Revert "ASoC: ad1836: reset and restore clock control mode in suspend/resume entry"
This reverts commit afe1c2cd71eb4e0fade720b5709722e7124f29c0 since it doesn't build.
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/ad1836.c32
1 files changed, 0 insertions, 32 deletions
diff --git a/sound/soc/codecs/ad1836.c b/sound/soc/codecs/ad1836.c
index 83add2f3afba..2c18e3d1b71e 100644
--- a/sound/soc/codecs/ad1836.c
+++ b/sound/soc/codecs/ad1836.c
@@ -223,36 +223,6 @@ static unsigned int ad1836_read_reg_cache(struct snd_soc_codec *codec,
223 return reg_cache[reg]; 223 return reg_cache[reg];
224} 224}
225 225
226#ifdef CONFIG_PM
227static int ad1836_soc_suspend(struct platform_device *pdev,
228 pm_message_t state)
229{
230 struct snd_soc_device *socdev = platform_get_drvdata(pdev);
231 struct snd_soc_codec *codec = socdev->card->codec;
232
233 /* reset clock control mode */
234 u16 adc_ctrl2 = codec->read(codec, AD1836_ADC_CTRL2);
235 adc_ctrl2 &= ~AD1836_ADC_SERFMT_MASK;
236
237 return codec->write(codec, AD1836_ADC_CTRL2, adc_ctrl2);
238}
239
240static int ad1836_soc_resume(struct platform_device *pdev)
241{
242 struct snd_soc_device *socdev = platform_get_drvdata(pdev);
243 struct snd_soc_codec *codec = socdev->card->codec;
244
245 /* restore clock control mode */
246 u16 adc_ctrl2 = codec->read(codec, AD1836_ADC_CTRL2);
247 adc_ctrl2 |= AD1836_ADC_AUX;
248
249 return codec->write(codec, AD1836_ADC_CTRL2, adc_ctrl2);
250}
251#else
252#define ad1836_soc_suspend NULL
253#define ad1836_soc_resume NULL
254#endif
255
256static int __devinit ad1836_spi_probe(struct spi_device *spi) 226static int __devinit ad1836_spi_probe(struct spi_device *spi)
257{ 227{
258 struct snd_soc_codec *codec; 228 struct snd_soc_codec *codec;
@@ -434,8 +404,6 @@ static int ad1836_remove(struct platform_device *pdev)
434struct snd_soc_codec_device soc_codec_dev_ad1836 = { 404struct snd_soc_codec_device soc_codec_dev_ad1836 = {
435 .probe = ad1836_probe, 405 .probe = ad1836_probe,
436 .remove = ad1836_remove, 406 .remove = ad1836_remove,
437 .suspend = ad1836_soc_suspend,
438 .resume = ad1836_soc_resume,
439}; 407};
440EXPORT_SYMBOL_GPL(soc_codec_dev_ad1836); 408EXPORT_SYMBOL_GPL(soc_codec_dev_ad1836);
441 409