summaryrefslogtreecommitdiffstats
path: root/arch/x86/platform/olpc/olpc.c
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2011-06-25 17:34:18 +0100
committerH. Peter Anvin <hpa@linux.intel.com>2011-07-06 14:44:43 -0700
commita0f30f592d2d81e28f3ed7fea7f03246b0d55b75 (patch)
tree69c7ee6326798c71dd268ace19611fa093ba900a /arch/x86/platform/olpc/olpc.c
parentcfee95977bea090ae5ec4fd442ebd381792d46c4 (diff)
downloadlinux-a0f30f592d2d81e28f3ed7fea7f03246b0d55b75.tar.gz
linux-a0f30f592d2d81e28f3ed7fea7f03246b0d55b75.tar.bz2
linux-a0f30f592d2d81e28f3ed7fea7f03246b0d55b75.zip
x86, olpc: Add XO-1.5 SCI driver
Add a driver for the ACPI-based EC event interface found on the OLPC XO-1.5 laptop. This enables notification of battery/AC power events, and enables various devices to be used as wakeup sources through regular ACPI mechanisms. This driver can't be built as a module, because some drivers need to know at boot-time if SCI-based functionality is available via olpc_ec_wakeup_available(). Signed-off-by: Daniel Drake <dsd@laptop.org> Link: http://lkml.kernel.org/r/1309019658-1712-12-git-send-email-dsd@laptop.org Acked-by: Andres Salomon <dilinger@queued.net> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/platform/olpc/olpc.c')
-rw-r--r--arch/x86/platform/olpc/olpc.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/x86/platform/olpc/olpc.c b/arch/x86/platform/olpc/olpc.c
index 72fd041762fc..8b9940e78e2f 100644
--- a/arch/x86/platform/olpc/olpc.c
+++ b/arch/x86/platform/olpc/olpc.c
@@ -222,6 +222,15 @@ bool olpc_ec_wakeup_available(void)
return true;
#endif
+ /*
+ * XO-1.5 EC wakeups are available when olpc-xo15-sci driver is
+ * compiled in
+ */
+#ifdef CONFIG_OLPC_XO15_SCI
+ if (olpc_platform_info.boardrev >= olpc_board_pre(0xd0)) /* XO-1.5 */
+ return true;
+#endif
+
return false;
}
EXPORT_SYMBOL_GPL(olpc_ec_wakeup_available);