4 files changed, 209 insertions, 3 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 66b7b9d519d5..88889106ac9b 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2087,7 +2087,9 @@ config OLPC_XO1_SCI
         select MFD_CORE
         ---help---
           Add support for SCI-based features of the OLPC XO-1 laptop:
+           - EC-driven system wakeups
            - Power button
+           - Ebook switch
 
 endif # X86_32
 
diff --git a/arch/x86/include/asm/olpc.h b/arch/x86/include/asm/olpc.h
index 0e56d01907fe..87bdbca72f94 100644
--- a/arch/x86/include/asm/olpc.h
+++ b/arch/x86/include/asm/olpc.h
@@ -111,6 +111,7 @@ extern int olpc_ec_cmd(unsigned char cmd, unsigned char *inbuf, size_t inlen,
 #define EC_WRITE_SCI_MASK               0x1b
 #define EC_WAKE_UP_WLAN                 0x24
 #define EC_WLAN_LEAVE_RESET             0x25
+#define EC_READ_EB_MODE                 0x2a
 #define EC_SET_SCI_INHIBIT              0x32
 #define EC_SET_SCI_INHIBIT_RELEASE      0x34
 #define EC_WLAN_ENTER_RESET             0x35
@@ -144,7 +145,7 @@ extern int olpc_ec_cmd(unsigned char cmd, unsigned char *inbuf, size_t inlen,
 #define OLPC_GPIO_SMB_CLK      14
 #define OLPC_GPIO_SMB_DATA     15
 #define OLPC_GPIO_WORKAUX       geode_gpio(24)
-#define OLPC_GPIO_LID           geode_gpio(26)
-#define OLPC_GPIO_ECSCI         geode_gpio(27)
+#define OLPC_GPIO_LID           26
+#define OLPC_GPIO_ECSCI         27
 
 #endif /* _ASM_X86_OLPC_H */
diff --git a/arch/x86/platform/olpc/olpc-xo1-sci.c b/arch/x86/platform/olpc/olpc-xo1-sci.c
index 8fbf961dae89..63f50506078b 100644
--- a/arch/x86/platform/olpc/olpc-xo1-sci.c
+++ b/arch/x86/platform/olpc/olpc-xo1-sci.c
@@ -12,12 +12,15 @@
  */
 
 #include <linux/cs5535.h>
+#include <linux/device.h>
+#include <linux/gpio.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
 #include <linux/mfd/core.h>
 #include <linux/suspend.h>
+#include <linux/workqueue.h>
 
 #include <asm/io.h>
 #include <asm/msr.h>
@@ -28,8 +31,60 @@
 
 static unsigned long acpi_base;
 static struct input_dev *power_button_idev;
+static struct input_dev *ebook_switch_idev;
+
 static int sci_irq;
 
+/* Report current ebook switch state through input layer */
+static void send_ebook_state(void)
+{
+        unsigned char state;
+
+        if (olpc_ec_cmd(EC_READ_EB_MODE, NULL, 0, &state, 1)) {
+                pr_err(PFX "failed to get ebook state\n");
+                return;
+        }
+
+        input_report_switch(ebook_switch_idev, SW_TABLET_MODE, state);
+        input_sync(ebook_switch_idev);
+}
+
+/*
+ * Process all items in the EC's SCI queue.
+ *
+ * This is handled in a workqueue because olpc_ec_cmd can be slow (and
+ * can even timeout).
+ *
+ * If propagate_events is false, the queue is drained without events being
+ * generated for the interrupts.
+ */
+static void process_sci_queue(bool propagate_events)
+{
+        int r;
+        u16 data;
+
+        do {
+                r = olpc_ec_sci_query(&data);
+                if (r || !data)
+                        break;
+
+                pr_debug(PFX "SCI 0x%x received\n", data);
+
+                if (data == EC_SCI_SRC_EBOOK && propagate_events)
+                        send_ebook_state();
+        } while (data);
+
+        if (r)
+                pr_err(PFX "Failed to clear SCI queue");
+}
+
+static void process_sci_queue_work(struct work_struct *work)
+{
+        process_sci_queue(true);
+}
+
+static DECLARE_WORK(sci_work, process_sci_queue_work);
+
 static irqreturn_t xo1_sci_intr(int irq, void *dev_id)
 {
         struct platform_device *pdev = dev_id;
@@ -51,6 +106,11 @@ static irqreturn_t xo1_sci_intr(int irq, void *dev_id)
                 input_sync(power_button_idev);
         }
 
+        if (gpe & CS5536_GPIOM7_PME_FLAG) { /* EC GPIO */
+                cs5535_gpio_set(OLPC_GPIO_ECSCI, GPIO_NEGATIVE_EDGE_STS);
+                schedule_work(&sci_work);
+        }
+
         return IRQ_HANDLED;
 }
 
@@ -60,6 +120,19 @@ static int xo1_sci_suspend(struct platform_device *pdev, pm_message_t state)
                 olpc_xo1_pm_wakeup_set(CS5536_PM_PWRBTN);
         else
                 olpc_xo1_pm_wakeup_clear(CS5536_PM_PWRBTN);
+
+        if (device_may_wakeup(&ebook_switch_idev->dev))
+                olpc_ec_wakeup_set(EC_SCI_SRC_EBOOK);
+        else
+                olpc_ec_wakeup_clear(EC_SCI_SRC_EBOOK);
+
+        return 0;
+}
+
+static int xo1_sci_resume(struct platform_device *pdev)
+{
+        /* Enable all EC events */
+        olpc_ec_mask_write(EC_SCI_SRC_ALL);
         return 0;
 }
 
@@ -104,6 +177,50 @@ static int __devinit setup_sci_interrupt(struct platform_device *pdev)
         return r;
 }
 
+static int __devinit setup_ec_sci(void)
+{
+        int r;
+
+        r = gpio_request(OLPC_GPIO_ECSCI, "OLPC-ECSCI");
+        if (r)
+                return r;
+
+        gpio_direction_input(OLPC_GPIO_ECSCI);
+
+        /* Clear pending EC SCI events */
+        cs5535_gpio_set(OLPC_GPIO_ECSCI, GPIO_NEGATIVE_EDGE_STS);
+        cs5535_gpio_set(OLPC_GPIO_ECSCI, GPIO_POSITIVE_EDGE_STS);
+
+        /*
+         * Enable EC SCI events, and map them to both a PME and the SCI
+         * interrupt.
+         *
+         * Ordinarily, in addition to functioning as GPIOs, Geode GPIOs can
+         * be mapped to regular interrupts *or* Geode-specific Power
+         * Management Events (PMEs) - events that bring the system out of
+         * suspend. In this case, we want both of those things - the system
+         * wakeup, *and* the ability to get an interrupt when an event occurs.
+         *
+         * To achieve this, we map the GPIO to a PME, and then we use one
+         * of the many generic knobs on the CS5535 PIC to additionally map the