diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2017-01-13 16:04:32 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2017-02-13 10:29:43 +0100 |
| commit | 9c576bd35ef4086f25c04ec662019c33494ee2fb (patch) | |
| tree | a2833285bcf62364ea7b3dc9e159f906dbe98403 /drivers/mfd/cros_ec.c | |
| parent | mfd: max77686: Remove I2C device ID table (diff) | |
| download | linux-9c576bd35ef4086f25c04ec662019c33494ee2fb.tar.xz linux-9c576bd35ef4086f25c04ec662019c33494ee2fb.zip | |
mfd: cros_ec: Send correct suspend/resume event to EC
pm_suspend_via_firmware() will return false for platforms with ACPI
disabled and ACPI is a prerequisite for S0ix support.
With this patch, sleep state event sent to EC is forced to S3 if ACPI is
disabled.
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/cros_ec.c')
| -rw-r--r-- | drivers/mfd/cros_ec.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/mfd/cros_ec.c b/drivers/mfd/cros_ec.c index b8a50808bedb..9b66a98ba4bf 100644 --- a/drivers/mfd/cros_ec.c +++ b/drivers/mfd/cros_ec.c @@ -190,8 +190,9 @@ int cros_ec_suspend(struct cros_ec_device *ec_dev) int ret; u8 sleep_event; - sleep_event = pm_suspend_via_firmware() ? HOST_SLEEP_EVENT_S3_RESUME : - HOST_SLEEP_EVENT_S0IX_RESUME; + sleep_event = (!IS_ENABLED(CONFIG_ACPI) || pm_suspend_via_firmware()) ? + HOST_SLEEP_EVENT_S3_RESUME : + HOST_SLEEP_EVENT_S0IX_RESUME; ret = cros_ec_sleep_event(ec_dev, sleep_event); if (ret < 0) @@ -224,8 +225,9 @@ int cros_ec_resume(struct cros_ec_device *ec_dev) ec_dev->suspended = false; enable_irq(ec_dev->irq); - sleep_event = pm_suspend_via_firmware() ? HOST_SLEEP_EVENT_S3_RESUME : - HOST_SLEEP_EVENT_S0IX_RESUME; + sleep_event = (!IS_ENABLED(CONFIG_ACPI) || pm_suspend_via_firmware()) ? + HOST_SLEEP_EVENT_S3_RESUME : + HOST_SLEEP_EVENT_S0IX_RESUME; ret = cros_ec_sleep_event(ec_dev, sleep_event); if (ret < 0) |