diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-10 17:14:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-10 17:14:44 -0700 |
| commit | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (patch) | |
| tree | 9a90f7160d7a44a8ddb3a51fdaec866e01f1a359 | |
| parent | 0968cf51b6f2ca8a951de4b976370189cf43bbdd (diff) | |
| download | linux-3.10-53a5fbdc2dff55161a206ed1a1385a8fa8055c34.tar.gz linux-3.10-53a5fbdc2dff55161a206ed1a1385a8fa8055c34.tar.bz2 linux-3.10-53a5fbdc2dff55161a206ed1a1385a8fa8055c34.zip | |
ACPI: Allow setting SCI_EN bit in PM1_CONTROL register
This is needed by at least the Mac Mini's, which (incorrectly) come back
from suspend with SCI_EN clear.
Thanks to Frédéric Riss for hunting this down.
Acked-by: Frédéric Riss <frederic.riss@gmail.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Len Brown <len.brown@intel.com>
Cc: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/acpi/hardware/hwregs.c | 2 | ||||
| -rw-r--r-- | include/acpi/aclocal.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/acpi/hardware/hwregs.c b/drivers/acpi/hardware/hwregs.c index 3143f36fcec..fa58c1edce1 100644 --- a/drivers/acpi/hardware/hwregs.c +++ b/drivers/acpi/hardware/hwregs.c @@ -665,8 +665,6 @@ acpi_status acpi_hw_register_write(u8 use_lock, u32 register_id, u32 value) /* * Perform a read first to preserve certain bits (per ACPI spec) - * - * Note: This includes SCI_EN, we never want to change this bit */ status = acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK, ACPI_REGISTER_PM1_CONTROL, diff --git a/include/acpi/aclocal.h b/include/acpi/aclocal.h index a4d0e73d5ac..063c4b54290 100644 --- a/include/acpi/aclocal.h +++ b/include/acpi/aclocal.h @@ -708,7 +708,7 @@ struct acpi_bit_register_info { * must be preserved. */ #define ACPI_PM1_STATUS_PRESERVED_BITS 0x0800 /* Bit 11 */ -#define ACPI_PM1_CONTROL_PRESERVED_BITS 0x0201 /* Bit 9, Bit 0 (SCI_EN) */ +#define ACPI_PM1_CONTROL_PRESERVED_BITS 0x0200 /* Bit 9 (whatever) */ /* * Register IDs |