}
}
- -static void acpi_sleep_pts_switch(u32 acpi_state)
- -{
- - acpi_status status;
- -
- - status = acpi_execute_simple_method(NULL, "\\_PTS", acpi_state);
- - if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
- - /*
- - * OS can't evaluate the _PTS object correctly. Some warning
- - * message will be printed. But it won't break anything.
- - */
- - printk(KERN_NOTICE "Failure in evaluating _PTS object\n");
- - }
- -}
- -
- -static int sleep_notify_reboot(struct notifier_block *this,
+ +static int tts_notify_reboot(struct notifier_block *this,
unsigned long code, void *x)
{
acpi_sleep_tts_switch(ACPI_STATE_S5);
- -
- - acpi_sleep_pts_switch(ACPI_STATE_S5);
- -
return NOTIFY_DONE;
}
- -static struct notifier_block sleep_notifier = {
- - .notifier_call = sleep_notify_reboot,
+ +static struct notifier_block tts_notifier = {
+ + .notifier_call = tts_notify_reboot,
.next = NULL,
.priority = 0,
};
acpi_get_event_status(ACPI_EVENT_POWER_BUTTON, &pwr_btn_status);
-- if (pwr_btn_status & ACPI_EVENT_FLAG_SET) {
++ if (pwr_btn_status & ACPI_EVENT_FLAG_STATUS_SET) {
acpi_clear_event(ACPI_EVENT_POWER_BUTTON);
/* Flag for later */
pwr_btn_event_pending = true;
*/
acpi_disable_all_gpes();
/* Allow EC transactions to happen. */
-- acpi_ec_unblock_transactions_early();
++ acpi_ec_unblock_transactions();
suspend_nvs_restore();
/* Restore the NVS memory area */
suspend_nvs_restore();
/* Allow EC transactions to happen. */
-- acpi_ec_unblock_transactions_early();
++ acpi_ec_unblock_transactions();
}
static void acpi_pm_thaw(void)
pr_info(PREFIX "(supports%s)\n", supported);
/*
- - * Register the sleep_notifier to reboot notifier list so that the _TTS
- - * and _PTS object can also be evaluated when the system enters S5.
+ + * Register the tts_notifier to reboot notifier list so that the _TTS
+ + * object can also be evaluated when the system enters S5.
*/
- - register_reboot_notifier(&sleep_notifier);
+ + register_reboot_notifier(&tts_notifier);
return 0;
}
config WATCHDOG_SYSFS
bool "Read different watchdog information through sysfs"
- default n
help
Say Y here if you want to enable watchdog device status read through
sysfs attributes.
This driver can be built as a module. The module name is tangox_wdt.
+ config WDAT_WDT
+ tristate "ACPI Watchdog Action Table (WDAT)"
+ depends on ACPI
++ select WATCHDOG_CORE
+ select ACPI_WATCHDOG
+ help
+ This driver adds support for systems with ACPI Watchdog Action
+ Table (WDAT) table. Servers typically have this but it can be
+ found on some desktop machines as well. This driver will take
+ over the native iTCO watchdog driver found on many Intel CPUs.
+
+ To compile this driver as module, choose M here: the module will
+ be called wdat_wdt.
+
config WM831X_WATCHDOG
tristate "WM831x watchdog"
depends on MFD_WM831X
help
Support for memory mapped max63{69,70,71,72,73,74} watchdog timer.
+ config MAX77620_WATCHDOG
+ tristate "Maxim Max77620 Watchdog Timer"
+ depends on MFD_MAX77620
+ help
+ This is the driver for the Max77620 watchdog timer.
+ Say 'Y' here to enable the watchdog timer support for
+ MAX77620 chips. To compile this driver as a module,
+ choose M here: the module will be called max77620_wdt.
+
config IMX2_WDT
tristate "IMX2+ Watchdog"
depends on ARCH_MXC || ARCH_LAYERSCAPE
To compile this driver as a module, choose M here: the
module will be called qcom_wdt.
+ config MESON_GXBB_WATCHDOG
+ tristate "Amlogic Meson GXBB SoCs watchdog support"
+ depends on ARCH_MESON
+ select WATCHDOG_CORE
+ help
+ Say Y here to include support for the watchdog timer
+ in Amlogic Meson GXBB SoCs.
+ To compile this driver as a module, choose M here: the
+ module will be called meson_gxbb_wdt.
+
config MESON_WATCHDOG
tristate "Amlogic Meson SoCs watchdog support"
depends on ARCH_MESON
This driver adds watchdog support for the integrated watchdogs in the
Renesas R-Car and other SH-Mobile SoCs (usually named RWDT or SWDT).
+ config ASPEED_WATCHDOG
+ tristate "Aspeed 2400 watchdog support"
+ depends on ARCH_ASPEED || COMPILE_TEST
+ select WATCHDOG_CORE
+ help
+ Say Y here to include support for the watchdog timer
+ in Apseed BMC SoCs.
+
+ This driver is required to reboot the SoC.
+
+ To compile this driver as a module, choose M here: the
+ module will be called aspeed_wdt.
+
# AVR32 Architecture
config AT32AP700X_WDT
Most people will say N.
++comment "Watchdog Pretimeout Governors"
++
++config WATCHDOG_PRETIMEOUT_GOV
++ bool "Enable watchdog pretimeout governors"
++ help
++ The option allows to select watchdog pretimeout governors.
++
++if WATCHDOG_PRETIMEOUT_GOV
++
++choice
++ prompt "Default Watchdog Pretimeout Governor"
++ default WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC
++ help
++ This option selects a default watchdog pretimeout governor.
++ The governor takes its action, if a watchdog is capable
++ to report a pretimeout event.
++
++config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP
++ bool "noop"
++ select WATCHDOG_PRETIMEOUT_GOV_NOOP
++ help
++ Use noop watchdog pretimeout governor by default. If noop
++ governor is selected by a user, write a short message to
++ the kernel log buffer and don't do any system changes.
++
++config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC
++ bool "panic"
++ select WATCHDOG_PRETIMEOUT_GOV_PANIC
++ help
++ Use panic watchdog pretimeout governor by default, if
++ a watchdog pretimeout event happens, consider that
++ a watchdog feeder is dead and reboot is unavoidable.
++
++endchoice
++
++config WATCHDOG_PRETIMEOUT_GOV_NOOP
++ tristate "Noop watchdog pretimeout governor"
++ help
++ Noop watchdog pretimeout governor, only an informational
++ message is added to kernel log buffer.
++
++config WATCHDOG_PRETIMEOUT_GOV_PANIC
++ tristate "Panic watchdog pretimeout governor"
++ help
++ Panic watchdog pretimeout governor, on watchdog pretimeout
++ event put the kernel into panic.
++
++endif # WATCHDOG_PRETIMEOUT_GOV
++
endif # WATCHDOG
projects / thirdparty / linux.git / commitdiff
