Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84549d23 authored by Barry Song's avatar Barry Song Committed by Mark Brown
Browse files

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



tests show frequent suspend/resume(frequent poweroff/on ad1836 internal
components) maybe make ad1836 clock mode wrong sometimes after wakeup.
This patch reset/restore ad1836 clock mode while executing PM, then
ad1836 can always resume to right clock status.

Signed-off-by: default avatarBarry Song <21cnbao@gmail.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 895d4509

sound/soc/codecs/ad1836.c

+32 −0
Original line number Original line Diff line number Diff line
@@ -223,6 +223,36 @@ 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;
@@ -404,6 +434,8 @@ 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);

sound/soc/codecs/ad1836.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -54,6 +54,7 @@ 
#define AD1836_ADC_SERFMT_MASK	       (7 << 6)

#define AD1836_ADC_SERFMT_MASK	       (7 << 6)

#define AD1836_ADC_SERFMT_PCK256       (0x4 << 6)

#define AD1836_ADC_SERFMT_PCK256       (0x4 << 6)

#define AD1836_ADC_SERFMT_PCK128       (0x5 << 6)

#define AD1836_ADC_SERFMT_PCK128       (0x5 << 6)

#define AD1836_ADC_AUX                 (0x6 << 6)





#define AD1836_ADC_CTRL3               14

#define AD1836_ADC_CTRL3               14