summaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/skylake
diff options
context:
space:
mode:
authorJeeja KP <jeeja.kp@intel.com>2015-11-13 19:22:06 +0530
committerMark Brown <broonie@kernel.org>2015-11-18 18:46:36 +0000
commita71e269728ce42216cca8ce5145e97e777a36467 (patch)
treee106bfa95be5d23893797ecde8d5ee2fb7f21da8 /sound/soc/intel/skylake
parent28823f1538ce2f67b7c21e30d6b84c3e86f8c0fd (diff)
downloadblackbird-op-linux-a71e269728ce42216cca8ce5145e97e777a36467.tar.gz
blackbird-op-linux-a71e269728ce42216cca8ce5145e97e777a36467.zip
ASoC: Intel: Skylake: Don't enable WAKEENABLE on suspend
For HDA codecs WAKEENABLE bit is to programmed if codec event change has to wake the system when suspended. In skylake I2S systems which are currently supported we have only HDMI codec, which doesn't use this capability to detect a HDMI connect/ disconnect event. HDMI HDA codec uses display interface to detect connect/disconnect event. This patch removes the WAKEBIT enabling during device D0/D3 as this seems to cause spurious wakes on the system Signed-off-by: Jeeja KP <jeeja.kp@intel.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/skylake')
-rw-r--r--sound/soc/intel/skylake/skl.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index 8ead864f354a..bdb99dcbfdca 100644
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -191,9 +191,6 @@ static int skl_runtime_suspend(struct device *dev)
dev_dbg(bus->dev, "in %s\n", __func__);
- /* enable controller wake up event */
- snd_hdac_chip_updatew(bus, WAKEEN, 0, STATESTS_INT_MASK);
-
return _skl_suspend(ebus);
}
@@ -203,17 +200,11 @@ static int skl_runtime_resume(struct device *dev)
struct hdac_ext_bus *ebus = pci_get_drvdata(pci);
struct hdac_bus *bus = ebus_to_hbus(ebus);
struct skl *skl = ebus_to_skl(ebus);
- int status;
dev_dbg(bus->dev, "in %s\n", __func__);
- /* Read STATESTS before controller reset */
- status = snd_hdac_chip_readw(bus, STATESTS);
-
skl_init_pci(skl);
snd_hdac_bus_init_chip(bus, true);
- /* disable controller Wake Up event */
- snd_hdac_chip_updatew(bus, WAKEEN, STATESTS_INT_MASK, 0);
return _skl_resume(ebus);
}
OpenPOWER on IntegriCloud