Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2aa3741 authored by Daniel Drake's avatar Daniel Drake Committed by Ingo Molnar
Browse files

x86/olpc/xo1/sci: Produce wakeup events for buttons and switches 



Produce wakeup events for the XO-1's power button, lid switch
and ebook switch, taking care to only produce events when the
states have changed.

Signed-off-by: default avatarDaniel Drake <dsd@laptop.org>
Cc: dilinger@queued.net
Cc: pgf@laptop.org
Link: http://lkml.kernel.org/r/20120412171824.D14C49D401E@zog.reactivated.net


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 83125a3a

arch/x86/platform/olpc/olpc-xo1-sci.c

+21 −5
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/interrupt.h>

#include <linux/platform_device.h>

#include <linux/pm.h>

#include <linux/pm_wakeup.h>

#include <linux/mfd/core.h>

#include <linux/power_supply.h>

#include <linux/suspend.h>
@@ -83,8 +84,12 @@ static void send_ebook_state(void) 
		return;

	}



	if (!!test_bit(SW_TABLET_MODE, ebook_switch_idev->sw) == state)

		return; /* Nothing new to report. */



	input_report_switch(ebook_switch_idev, SW_TABLET_MODE, state);

	input_sync(ebook_switch_idev);

	pm_wakeup_event(&ebook_switch_idev->dev, 0);

}



static void flip_lid_inverter(void)
@@ -123,8 +128,12 @@ static void detect_lid_state(void) 
/* Report current lid switch state through input layer */

static void send_lid_state(void)

{

	if (!!test_bit(SW_LID, lid_switch_idev->sw) == !lid_open)

		return; /* Nothing new to report. */



	input_report_switch(lid_switch_idev, SW_LID, !lid_open);

	input_sync(lid_switch_idev);

	pm_wakeup_event(&lid_switch_idev->dev, 0);

}



static ssize_t lid_wake_mode_show(struct device *dev,
@@ -213,12 +222,19 @@ static irqreturn_t xo1_sci_intr(int irq, void *dev_id) 


	dev_dbg(&pdev->dev, "sts %x gpe %x\n", sts, gpe);



	if (sts & CS5536_PWRBTN_FLAG && !(sts & CS5536_WAK_FLAG)) {

	if (sts & CS5536_PWRBTN_FLAG) {

		if (!(sts & CS5536_WAK_FLAG)) {

			/* Only report power button input when it was pressed

			 * during regular operation (as opposed to when it

			 * was used to wake the system). */

			input_report_key(power_button_idev, KEY_POWER, 1);

			input_sync(power_button_idev);

			input_report_key(power_button_idev, KEY_POWER, 0);

			input_sync(power_button_idev);

		}

		/* Report the wakeup event in all cases. */

		pm_wakeup_event(&power_button_idev->dev, 0);

	}



	if (gpe & CS5536_GPIOM7_PME_FLAG) { /* EC GPIO */

		cs5535_gpio_set(OLPC_GPIO_ECSCI, GPIO_NEGATIVE_EDGE_STS);