From patchwork Wed Jun 15 14:33:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 882232 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5FEQ4FK020227 for ; Wed, 15 Jun 2011 14:26:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755377Ab1FOOZs (ORCPT ); Wed, 15 Jun 2011 10:25:48 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:59140 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755354Ab1FOOZp (ORCPT ); Wed, 15 Jun 2011 10:25:45 -0400 Received: by pzk9 with SMTP id 9so277192pzk.19 for ; Wed, 15 Jun 2011 07:25:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:date:message-id:subject; bh=/jPe23qvUL0JKqVmxgQqUCPGsAj/nL8IGcb2V39flCg=; b=FUZFUXJVbZCiOivSIYKB4536CtBXiXCDlLIKxP6gBVHCnvkujXLDFQDNvnWJ+EspTK doEfnwfWwKJVI6CWb8D4+qwctnOxKyJwgOGMkxmy7Oi4Uy0PuEx/n16mL7Iz6CEDGsMN xKW2qMWSnNfZn2ttFLaHBBk+9lIbjZ11hPJ1I= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:subject; b=CtTZrOOkDMVhC5qDWe/thhByJ6jTa/m3PDht8r0mkaQdwptldkG9DA5mLvdj7tmCBk 9/BXSYtXM6BrZat+NgrIEH40itlimxjMdRqgR/wpx04oYFTo+wX18LqY7QVmxVV9Buxh c2BQYsV7DBPXxwPXYBkzKAZbrMzY3Hg9sMWA4= Received: by 10.68.14.74 with SMTP id n10mr306141pbc.489.1308147944298; Wed, 15 Jun 2011 07:25:44 -0700 (PDT) Received: from [127.0.0.1] (FLH1Aim011.tky.mesh.ad.jp [125.193.48.11]) by mx.google.com with ESMTPS id v6sm312835pbh.70.2011.06.15.07.25.42 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 15 Jun 2011 07:25:43 -0700 (PDT) From: Magnus Damm To: linux-input@vger.kernel.org Cc: lethal@linux-sh.org, Magnus Damm , dmitry.torokhov@gmail.com, simon@horms.net, linux-sh@vger.kernel.org Date: Wed, 15 Jun 2011 23:33:40 +0900 Message-Id: <20110615143340.21798.61858.sendpatchset@t400s> Subject: [PATCH] input: sh_keysc: 8x8 MODE_6 fix Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 15 Jun 2011 14:26:05 +0000 (UTC) From: Magnus Damm The MODE_6 support in sh_keysc.c is incorrect without this patch. According to the data sheet for G4, AP4 and AG5 KEYSC MODE_6 is 8x8 keys. Bump up MAXKEYS to 64 too. Signed-off-by: Magnus Damm Reviewed-by: Simon Horman --- drivers/input/keyboard/sh_keysc.c | 2 +- include/linux/input/sh_keysc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0001/drivers/input/keyboard/sh_keysc.c +++ work/drivers/input/keyboard/sh_keysc.c 2011-06-15 17:59:27.000000000 +0900 @@ -32,7 +32,7 @@ static const struct { [SH_KEYSC_MODE_3] = { 2, 4, 7 }, [SH_KEYSC_MODE_4] = { 3, 6, 6 }, [SH_KEYSC_MODE_5] = { 4, 6, 7 }, - [SH_KEYSC_MODE_6] = { 5, 7, 7 }, + [SH_KEYSC_MODE_6] = { 5, 8, 8 }, }; struct sh_keysc_priv { --- 0001/include/linux/input/sh_keysc.h +++ work/include/linux/input/sh_keysc.h 2011-06-15 17:48:05.000000000 +0900 @@ -1,7 +1,7 @@ #ifndef __SH_KEYSC_H__ #define __SH_KEYSC_H__ -#define SH_KEYSC_MAXKEYS 49 +#define SH_KEYSC_MAXKEYS 64 struct sh_keysc_info { enum { SH_KEYSC_MODE_1, SH_KEYSC_MODE_2, SH_KEYSC_MODE_3,