diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2005-09-27 11:12:13 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-27 11:12:13 +0000 |
| commit | 4493a082074eba3d9113856924f34c4deb1ff20d (patch) | |
| tree | 65a7b00b32513572ff7caf7aeb9ff1a91bc4eff5 /packages | |
| parent | 0df2d2a4a3caac37a2f1a2b2d795170ad01b0a42 (diff) | |
openzaurus-pxa kernel: added APM fix for 'suspend on right-arrow' problem
patch 'ported' to poodle by 'eccerr0r' from collie fix
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/apm_arrowkey.patch | 27 | ||||
| -rw-r--r-- | packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc | 3 |
2 files changed, 29 insertions, 1 deletions
diff --git a/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/apm_arrowkey.patch b/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/apm_arrowkey.patch new file mode 100644 index 0000000000..db16eb0497 --- /dev/null +++ b/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/apm_arrowkey.patch @@ -0,0 +1,27 @@ +--- linux/arch/arm/mach-pxa/sharpsl_apm.c-original 2005-09-07 02:38:21.000000000 -0600 ++++ linux/arch/arm/mach-pxa/sharpsl_apm.c 2005-09-08 01:11:56.000000000 -0600 +@@ -89,6 +89,7 @@ + #include <linux/ioctl.h> + #include <asm/sharp_apm.h> + #include <asm/sharp_char.h> ++#include <asm-arm/arch-pxa/keyboard_poodle.h> /* blc */ + #include <linux/delay.h> + #include <asm/arch/ads7846_ts.h> + #include <linux/apm_bios.h> +@@ -155,6 +156,7 @@ + /// ioctl + #if defined(CONFIG_ARCH_PXA_POODLE) || defined(CONFIG_ARCH_PXA_CORGI) || defined(CONFIG_ARCH_PXA_TOSA) + static u32 apm_event_mask = (APM_EVT_POWER_BUTTON); ++extern kbd_keyinfo sharppda_kbdstate[(NR_KEYCODES+1)]; + #else + static u32 apm_event_mask = (APM_EVT_POWER_BUTTON | APM_EVT_BATTERY_STATUS); + #endif +@@ -472,7 +474,7 @@ + if (irq == IRQ_GPIO_ON_KEY) { /* suspend */ + + DPRINTK("irq=%d count=%d sharpsl_suspend_request%d\n",irq, count, sharpsl_suspend_request); +- if ( GPLR(GPIO_ON_KEY) & GPIO_bit(GPIO_ON_KEY) ) { ++ if ( GPLR(GPIO_ON_KEY) & GPIO_bit(GPIO_ON_KEY) || (!sharppda_kbdstate[1].in) ) { /* second half, if something other than cancel is pushed blc */ + /* release */ + count = 0; + } else { diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc index dfea2b527e..472ad50248 100644 --- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc +++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc @@ -3,7 +3,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" SECTION = "kernel" LICENSE = "GPL" PV = "2.4.18-rmk7-pxa3-embedix" -PR = "r43" +PR = "r44" KV = "2.4.18" RMKV = "7" @@ -52,6 +52,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ file://fix_tosa_apm.patch;patch=1 \ file://dumb-hack-for-wlan-ng.patch;patch=1 \ file://unb0rk-apm.patch;patch=1 \ + file://apm_arrowkey.patch;patch=1 \ file://defconfig-${MACHINE} " SRC_URI_append_poodle += " file://smallfonts.diff;patch=1" |