3 files changed, 208 insertions, 1 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 88889106ac9b..350ccbb4d650 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2090,6 +2090,7 @@ config OLPC_XO1_SCI
            - EC-driven system wakeups
            - Power button
            - Ebook switch
+           - Lid switch
 
 endif # X86_32
 
diff --git a/arch/x86/platform/olpc/olpc-xo1-sci.c b/arch/x86/platform/olpc/olpc-xo1-sci.c
index 63f50506078b..ad0670bca833 100644
--- a/arch/x86/platform/olpc/olpc-xo1-sci.c
+++ b/arch/x86/platform/olpc/olpc-xo1-sci.c
@@ -32,9 +32,26 @@
 static unsigned long acpi_base;
 static struct input_dev *power_button_idev;
 static struct input_dev *ebook_switch_idev;
+static struct input_dev *lid_switch_idev;
 
 static int sci_irq;
 
+static bool lid_open;
+static bool lid_inverted;
+static int lid_wake_mode;
+
+enum lid_wake_modes {
+        LID_WAKE_ALWAYS,
+        LID_WAKE_OPEN,
+        LID_WAKE_CLOSE,
+};
+
+static const char * const lid_wake_mode_names[] = {
+        [LID_WAKE_ALWAYS] = "always",
+        [LID_WAKE_OPEN] = "open",
+        [LID_WAKE_CLOSE] = "close",
+};
+
 /* Report current ebook switch state through input layer */
 static void send_ebook_state(void)
 {
@@ -49,6 +66,70 @@ static void send_ebook_state(void)
         input_sync(ebook_switch_idev);
 }
 
+static void flip_lid_inverter(void)
+{
+        /* gpio is high; invert so we'll get l->h event interrupt */
+        if (lid_inverted)
+                cs5535_gpio_clear(OLPC_GPIO_LID, GPIO_INPUT_INVERT);
+        else
+                cs5535_gpio_set(OLPC_GPIO_LID, GPIO_INPUT_INVERT);
+        lid_inverted = !lid_inverted;
+}
+
+static void detect_lid_state(void)
+{
+        /*
+         * the edge detector hookup on the gpio inputs on the geode is
+         * odd, to say the least.  See http://dev.laptop.org/ticket/5703
+         * for details, but in a nutshell:  we don't use the edge
+         * detectors.  instead, we make use of an anomoly:  with the both
+         * edge detectors turned off, we still get an edge event on a
+         * positive edge transition.  to take advantage of this, we use the
+         * front-end inverter to ensure that that's the edge we're always
+         * going to see next.
+         */
+
+        int state;
+
+        state = cs5535_gpio_isset(OLPC_GPIO_LID, GPIO_READ_BACK);
+        lid_open = !state ^ !lid_inverted; /* x ^^ y */
+        if (!state)
+                return;
+
+        flip_lid_inverter();
+}
+
+/* Report current lid switch state through input layer */
+static void send_lid_state(void)
+{
+        input_report_switch(lid_switch_idev, SW_LID, !lid_open);
+        input_sync(lid_switch_idev);
+}
+
+static ssize_t lid_wake_mode_show(struct device *dev,
+                                  struct device_attribute *attr, char *buf)
+{
+        const char *mode = lid_wake_mode_names[lid_wake_mode];
+        return sprintf(buf, "%s\n", mode);
+}
+static ssize_t lid_wake_mode_set(struct device *dev,
+                                 struct device_attribute *attr,
+                                 const char *buf, size_t count)
+{
+        int i;
+        for (i = 0; i < ARRAY_SIZE(lid_wake_mode_names); i++) {
+                const char *mode = lid_wake_mode_names[i];
+                if (strlen(mode) != count || strncasecmp(mode, buf, count))
+                        continue;
+
+                lid_wake_mode = i;
+                return count;
+        }
+        return -EINVAL;
+}
+static DEVICE_ATTR(lid_wake_mode, S_IWUSR | S_IRUGO, lid_wake_mode_show,
+                   lid_wake_mode_set);
+
 /*
  * Process all items in the EC's SCI queue.
  *
@@ -111,6 +192,11 @@ static irqreturn_t xo1_sci_intr(int irq, void *dev_id)
                 schedule_work(&sci_work);
         }
 
+        cs5535_gpio_set(OLPC_GPIO_LID, GPIO_NEGATIVE_EDGE_STS);
+        cs5535_gpio_set(OLPC_GPIO_LID, GPIO_POSITIVE_EDGE_STS);
+        detect_lid_state();
+        send_lid_state();
+
         return IRQ_HANDLED;
 }
 
@@ -126,11 +212,32 @@ static int xo1_sci_suspend(struct platform_device *pdev, pm_message_t state)
         else
                 olpc_ec_wakeup_clear(EC_SCI_SRC_EBOOK);
 
+        if (!device_may_wakeup(&lid_switch_idev->dev)) {
+                cs5535_gpio_clear(OLPC_GPIO_LID, GPIO_EVENTS_ENABLE);
+        } else if ((lid_open && lid_wake_mode == LID_WAKE_OPEN) ||
+                   (!lid_open && lid_wake_mode == LID_WAKE_CLOSE)) {
+                flip_lid_inverter();
+
+                /* we may have just caused an event */
+                cs5535_gpio_set(OLPC_GPIO_LID, GPIO_NEGATIVE_EDGE_STS);
+                cs5535_gpio_set(OLPC_GPIO_LID, GPIO_POSITIVE_EDGE_STS);
+
+                cs5535_gpio_set(OLPC_GPIO_LID, GPIO_EVENTS_ENABLE);
+        }
+
         return 0;
 }
 
 static int xo1_sci_resume(struct platform_device *pdev)
 {
+        /*
+         * We don't know what may have happened while we were asleep.
+         * Reestablish our lid setup so we're sure to catch all transitions.
+         */
+        detect_lid_state();
+        send_lid_state();
+        cs5535_gpio_set(OLPC_GPIO_LID, GPIO_EVENTS_ENABLE);
+
         /* Enable all EC events */
         olpc_ec_mask_write(EC_SCI_SRC_ALL);
         return 0;
@@ -221,6 +328,43 @@ static void free_ec_sci(void)
         gpio_free(OLPC_GPIO_ECSCI);
 }
 
+static int __devinit setup_lid_events(void)
+{
+        int r;
+
+        r = gpio_request(OLPC_GPIO_LID, "OLPC-LID");
+        if (r)
+                return r;
+
+        gpio_direction_input(OLPC_GPIO_LID);
+
+        cs5535_gpio_clear(OLPC_GPIO_LID, GPIO_INPUT_INVERT);
+        lid_inverted = 0;
+
+        /* Clear edge detection and event enable for now */
+        cs5535_gpio_clear(OLPC_GPIO_LID, GPIO_EVENTS_ENABLE);
+        cs5535_gpio_clear(OLPC_GPIO_LID, GPIO_NEGATIVE_EDGE_EN);
+        cs5535_gpio_clear(OLPC_GPIO_LID, GPIO_POSITIVE_EDGE_EN);
+        cs5535_gpio_set(OLPC_GPIO_LID, GPIO_NEGATIVE_EDGE_STS);
+        cs5535_gpio_set(OLPC_GPIO_LID, GPIO_POSITIVE_EDGE_STS);