r1715 - trunk/src/target/kernel/patches

mickey at sita.openmoko.org mickey at sita.openmoko.org
Mon Apr 9 19:06:54 CEST 2007


Author: mickey
Date: 2007-04-09 19:06:54 +0200 (Mon, 09 Apr 2007)
New Revision: 1715

Modified:
   trunk/src/target/kernel/patches/gta01-inputdevice.patch
   trunk/src/target/kernel/patches/gta01-pcf50606.patch
Log:
kernel: fix input_report logics for KEY_PHONE and KEY_POWER (was vice versa)
NOTE: Harald, please check for the remaining input_report calls as well


Modified: trunk/src/target/kernel/patches/gta01-inputdevice.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-inputdevice.patch	2007-04-09 12:09:52 UTC (rev 1714)
+++ trunk/src/target/kernel/patches/gta01-inputdevice.patch	2007-04-09 17:06:54 UTC (rev 1715)
@@ -75,9 +75,9 @@
 +
 +	/* FIXME: use GPIO from platform_dev resources */
 +	if (s3c2410_gpio_getpin(GTA01_GPIO_AUX_KEY))
++		input_report_key(gta01kbd_data->input, KEY_PHONE, 0);
++	else
 +		input_report_key(gta01kbd_data->input, KEY_PHONE, 1);
-+	else
-+		input_report_key(gta01kbd_data->input, KEY_PHONE, 0);
 +
 +	input_sync(gta01kbd_data->input);
 +

Modified: trunk/src/target/kernel/patches/gta01-pcf50606.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-pcf50606.patch	2007-04-09 12:09:52 UTC (rev 1714)
+++ trunk/src/target/kernel/patches/gta01-pcf50606.patch	2007-04-09 17:06:54 UTC (rev 1715)
@@ -571,7 +571,7 @@
 +		/* ONKEY falling edge (start of button press) */
 +		DEBUGPC("ONKEYF ");
 +		pcf->flags |= PCF50606_F_PWR_PRESSED;
-+		input_report_key(pcf->input_dev, KEY_POWER, 0);
++		input_report_key(pcf->input_dev, KEY_POWER, 1);
 +	}
 +	if (int1 & PCF50606_INT1_ONKEY1S) {
 +		/* ONKEY pressed for more than 1 second */
@@ -589,7 +589,7 @@
 +		DEBUGPC("ONKEYR ");
 +		pcf->flags &= ~PCF50606_F_PWR_PRESSED;
 +		pcf->onkey_seconds = -1;
-+		input_report_key(pcf->input_dev, KEY_POWER, 1);
++		input_report_key(pcf->input_dev, KEY_POWER, 0);
 +		/* disable SECOND interrupt in case RTC didn't
 +		 * request it */
 +		if (!(pcf->flags & PCF50606_F_RTC_SECOND))





More information about the commitlog mailing list