From: Jonathan McDowell Date: Wed, 1 Nov 2006 20:02:14 +0000 (+0200) Subject: ARM: OMAP: Fix Amstrad Delta omap-keypad usage X-Git-Tag: v2.6.19-omap1~91 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=fd04eb6a222647807a57580cf33bf285a43b01a7;p=linux-2.6-omap-h63xx.git ARM: OMAP: Fix Amstrad Delta omap-keypad usage On Fri, Oct 27, 2006 at 05:16:59PM +0100, Jonathan McDowell wrote: > However having prodded further I'm seeing incorrect key parsing with > the omap-keypad driver under both -rc2 and -rc3 (works fine in > 2.6.18-omap1). Numerous keys now returns strings of characters rather > than the single expected character. A few keys still work as expected > however. Before I dig in further is anyone else seeing anything similar? This appears to be due to the addition of keymapsize to the omap_kp_platform_data structure. The patch below fixes things up for the Delta; other boards appear to have already had this done. Signed-off-by: Jonathan McDowell Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index 0a0c06fd2a6..c73ca61e585 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c @@ -187,10 +187,11 @@ static struct resource ams_delta_kp_resources[] = { }; static struct omap_kp_platform_data ams_delta_kp_data = { - .rows = 8, - .cols = 8, - .keymap = ams_delta_keymap, - .rep = 1, + .rows = 8, + .cols = 8, + .keymap = ams_delta_keymap, + .keymapsize = ARRAY_SIZE(ams_delta_keymap), + .delay = 9, }; static struct platform_device ams_delta_kp_device = {