diff options
| author | Wenkai Du <wenkai.du@intel.com> | 2018-02-22 13:30:52 -0800 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2018-05-16 09:21:48 +0100 |
| commit | 99fb0f25c448ab72481bd700b66e0e48c583ef5a (patch) | |
| tree | 1c455736b93d9eb654361a041ae9da29bb7b290a /drivers/mfd/cros_ec.c | |
| parent | 37c089d1facaf03969f66a5469c169a2c73429f6 (diff) | |
| download | linux-next-99fb0f25c448ab72481bd700b66e0e48c583ef5a.tar.gz | |
Revert "mfd: cros_ec: Add ACPI GPE handler for LID0 devices"
This reverts commit e04653a9dcf4d98defe2149c885382e5cc72082f.
It is no longer needed to install Chrome EC GPE handler to have
GPE enabled in suspend to idle path. It is found that with this
handler installed, EC wake up doesn't work because default EC
event handler that can wake up system is not getting called.
Signed-off-by: Wenkai Du <wenkai.du@intel.com>
Acked-by: Benson Leung <bleung@chromium.org>
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 | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/mfd/cros_ec.c b/drivers/mfd/cros_ec.c index d61024141e2b..c221163d5b9e 100644 --- a/drivers/mfd/cros_ec.c +++ b/drivers/mfd/cros_ec.c @@ -173,8 +173,6 @@ int cros_ec_register(struct cros_ec_device *ec_dev) dev_info(dev, "Chrome EC device registered\n"); - cros_ec_acpi_install_gpe_handler(dev); - return 0; fail_mfd: @@ -188,8 +186,6 @@ int cros_ec_remove(struct cros_ec_device *ec_dev) { mfd_remove_devices(ec_dev->dev); - cros_ec_acpi_remove_gpe_handler(); - if (ec_dev->irq) free_irq(ec_dev->irq, ec_dev); @@ -204,14 +200,9 @@ int cros_ec_suspend(struct cros_ec_device *ec_dev) int ret; u8 sleep_event; - if (!IS_ENABLED(CONFIG_ACPI) || pm_suspend_via_firmware()) { - sleep_event = HOST_SLEEP_EVENT_S3_SUSPEND; - } else { - sleep_event = HOST_SLEEP_EVENT_S0IX_SUSPEND; - - /* Clearing the GPE status for any pending event */ - cros_ec_acpi_clear_gpe(); - } + sleep_event = (!IS_ENABLED(CONFIG_ACPI) || pm_suspend_via_firmware()) ? + HOST_SLEEP_EVENT_S3_SUSPEND : + HOST_SLEEP_EVENT_S0IX_SUSPEND; ret = cros_ec_sleep_event(ec_dev, sleep_event); if (ret < 0) |