From 7e46b32bd58768b4823e767dc14d88ab59c6902e Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Fri, 2 Mar 2018 16:55:54 -0800 Subject: ACPI / Kconfig: Update ACPI_PROCFS_POWER help text Fix grammar and punctuation (end sentences with a period) in the Kconfig help text for ACPI_PROCFS_POWER. I was looking at this since it appears to be going away (again, some day) and I have a working script that uses this info to tell me battery usage. I can update the script to use /sys/class/power_supply (in theory) but the contents (with units) should be documented in Documentation/ABI/ before /proc/acpi/battery/ is removed (IMO). Signed-off-by: Randy Dunlap Signed-off-by: Rafael J. Wysocki --- drivers/acpi/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/acpi/Kconfig') diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index f505e9a01b2d..ef78b9ee9e0e 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -105,14 +105,14 @@ config ACPI_PROCFS_POWER deprecated power /proc/acpi/ directories to exist, even when they have been replaced by functions in /sys. The deprecated directories (and their replacements) include: - /proc/acpi/battery/* (/sys/class/power_supply/*) - /proc/acpi/ac_adapter/* (sys/class/power_supply/*) + /proc/acpi/battery/* (/sys/class/power_supply/*) and + /proc/acpi/ac_adapter/* (sys/class/power_supply/*). This option has no effect on /proc/acpi/ directories - and functions, which do not yet exist in /sys + and functions which do not yet exist in /sys. This option, together with the proc directories, will be deleted in the future. - Say N to delete power /proc/acpi/ directories that have moved to /sys/ + Say N to delete power /proc/acpi/ directories that have moved to /sys. config ACPI_REV_OVERRIDE_POSSIBLE bool "Allow supported ACPI revision to be overridden" -- cgit v1.2.3 From 95c513ec84f7ff35cd9d8c7ce4a99f770bd82c3b Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Fri, 16 Mar 2018 13:51:01 +0100 Subject: ACPI: Add Time and Alarm Device (TAD) driver Introduce a driver for the ACPI Time and Alarm Device (TAD) based on Section 9.18 of ACPI 6.2. This driver only supports the system wakeup capabilities of the TAD which are mandatory. Support for the RTC capabilities of the TAD will be added to it in the future. This driver is entirely sysfs-based. It provides attributes (under the TAD platform device) to allow user space to manage the AC and DC wakeup timers of the TAD: set and read their values, set and check their expire timer wake policies, check and clear their status and check the capabilities of the TAD reported by AML. The DC timer attributes are only present if the TAD supports a separate DC alarm timer. The wakeup events handling and power management of the TAD is expected to be taken care of by the ACPI PM domain attached to its platform device. Signed-off-by: Rafael J. Wysocki Reviewed-by: Mika Westerberg Tested-by: Mika Westerberg --- drivers/acpi/Kconfig | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'drivers/acpi/Kconfig') diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index f505e9a01b2d..7cea52ab4418 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -217,6 +217,19 @@ config ACPI_FAN To compile this driver as a module, choose M here: the module will be called fan. +config ACPI_TAD + tristate "ACPI Time and Alarm (TAD) Device Support" + depends on SYSFS && PM_SLEEP + help + The ACPI Time and Alarm (TAD) device is an alternative to the Real + Time Clock (RTC). Its wake timers allow the system to transition from + the S3 (or optionally S4/S5) state to S0 state after a time period + elapses. In comparison with the RTC Alarm, the TAD provides a larger + scale of flexibility in the wake timers. The time capabilities of the + TAD maintain the time of day information across platform power + transitions, and keep track of time even when the platform is turned + off. + config ACPI_DOCK bool "Dock" help -- cgit v1.2.3