diff options
| author | Azhar Shaikh <azhar.shaikh@intel.com> | 2016-10-12 19:12:20 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2016-11-16 10:50:25 +0100 |
| commit | 274e43edcda6f709aa67e436b3123e45a6270923 (patch) | |
| tree | 4c6a3e9c64fe5b6f7d03eebf522846e772866274 /drivers/mfd/intel-lpss.c | |
| parent | mfd: lpss: Fix Intel Kaby Lake PCH-H properties (diff) | |
| download | linux-274e43edcda6f709aa67e436b3123e45a6270923.tar.xz linux-274e43edcda6f709aa67e436b3123e45a6270923.zip | |
mfd: intel-lpss: Do not put device in reset state on suspend
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.
Cc: stable@vger.kernel.org
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>
Diffstat (limited to 'drivers/mfd/intel-lpss.c')
| -rw-r--r-- | drivers/mfd/intel-lpss.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c index 41b113875d64..70c646b0097d 100644 --- a/drivers/mfd/intel-lpss.c +++ b/drivers/mfd/intel-lpss.c @@ -502,9 +502,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); |