aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzhar Shaikh <azhar.shaikh@intel.com>2016-10-12 10:12:20 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-11-26 09:54:52 +0100
commit0c6e0db9686bfd119593a28fb26704dc58864b70 (patch)
tree97efff9e4ea37885ae4824613649e6115fafd708
parentb7321bcc8b1c153cb50eddbe4d90fdbc89c9d0b9 (diff)
downloadlinux-linaro-stable-0c6e0db9686bfd119593a28fb26704dc58864b70.tar.gz
mfd: intel-lpss: Do not put device in reset state on suspend
commit 274e43edcda6f709aa67e436b3123e45a6270923 upstream. Commit 41a3da2b8e163 ("mfd: intel-lpss: Save register context on suspend") saved the register context while going to suspend and also put the device in reset state. Due to the resetting of device, system cannot enter S3/S0ix states when no_console_suspend flag is enabled. The system and serial console both hang. The resetting of device is not needed while going to suspend. Hence remove this code. Fixes: 41a3da2b8e163 ("mfd: intel-lpss: Save register context on suspend") Signed-off-by: Azhar Shaikh <azhar.shaikh@intel.com> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/mfd/intel-lpss.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c
index 88e80ec772f6..fe89e5e337d5 100644
--- a/drivers/mfd/intel-lpss.c
+++ b/drivers/mfd/intel-lpss.c
@@ -494,9 +494,6 @@ int intel_lpss_suspend(struct device *dev)
for (i = 0; i < LPSS_PRIV_REG_COUNT; i++)
lpss->priv_ctx[i] = readl(lpss->priv + i * 4);
- /* Put the device into reset state */
- writel(0, lpss->priv + LPSS_PRIV_RESETS);
-
return 0;
}
EXPORT_SYMBOL_GPL(intel_lpss_suspend);