]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
mfd: intel-lpss: Do not put device in reset state on suspend
authorAzhar Shaikh <azhar.shaikh@intel.com>
Wed, 12 Oct 2016 17:12:20 +0000 (10:12 -0700)
committerLee Jones <lee.jones@linaro.org>
Wed, 16 Nov 2016 09:50:25 +0000 (09:50 +0000)
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>
drivers/mfd/intel-lpss.c

index 41b113875d6452acc545085ffbc4c52c23079338..70c646b0097d8c70ded6c4f62a92711aa89bfd22 100644 (file)
@@ -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);