From: Mark Brown Date: Mon, 14 Apr 2008 13:27:30 +0000 (+0200) Subject: [ALSA] wm9713: Don't control touch screen power on suspend X-Git-Tag: v2.6.26-rc1~1087^2~55 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=87b57fe2d3fb1ce33671b944db9a4cbe0cd065ea;p=linux-2.6-omap-h63xx.git [ALSA] wm9713: Don't control touch screen power on suspend Leave the power bit for the touch screen alone when suspending the WM9713 so that the touch screen driver can handle it. This allows the touch screen to be used as a wakeup source when the system is suspended. Signed-off-by: Mark Brown Signed-off-by: Takashi Iwai --- diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index e3174c4d980..1f241161445 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -1132,8 +1132,17 @@ static int wm9713_soc_suspend(struct platform_device *pdev, { struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_codec *codec = socdev->codec; + u16 reg; + + /* Disable everything except touchpanel - that will be handled + * by the touch driver and left disabled if touch is not in + * use. */ + reg = ac97_read(codec, AC97_EXTENDED_MID); + ac97_write(codec, AC97_EXTENDED_MID, reg | 0x7fff); + ac97_write(codec, AC97_EXTENDED_MSTATUS, 0xffff); + ac97_write(codec, AC97_POWERDOWN, 0x6f00); + ac97_write(codec, AC97_POWERDOWN, 0xffff); - wm9713_dapm_event(codec, SNDRV_CTL_POWER_D3cold); return 0; }