From patchwork Mon Feb 8 06:32:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 77665 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o186dOgq023298 for ; Mon, 8 Feb 2010 06:39:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753170Ab0BHGjX (ORCPT ); Mon, 8 Feb 2010 01:39:23 -0500 Received: from mail-yw0-f189.google.com ([209.85.211.189]:44357 "EHLO mail-yw0-f189.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753127Ab0BHGjX (ORCPT ); Mon, 8 Feb 2010 01:39:23 -0500 Received: by mail-yw0-f189.google.com with SMTP id 27so5142357ywh.1 for ; Sun, 07 Feb 2010 22:39:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:date:message-id :in-reply-to:references:subject; bh=RtGNUrjSyOX+i5+ptqldIUSyix3oHg0hF0grkp/7gKc=; b=dNfSMDThp26uW2uAa57+oHAK8lEEmasNoxAMuQAUI1HZgwOiOZcxOXxG5G8iyNy10a uLAshZBxNrhdQghSH9VDKzGklqa2wj6Uqlx2BoVkeUTL1KdUTQoKzYxDoDiF/xvx6sxH EfaBT3BYzy2spq88B7+k54NsPCzRVIkrgzdng= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:in-reply-to:references:subject; b=SmvMab4VSYhoODJZTOXm7Sxha40+07qDuTqvhk0b5DRE1iCqtW3azr3odXG77XlRUa vs6uVAoL/vl5KhOzTKlTub9zpQhoUhoOh8jtLo50o5v0NaupYWoeZm7u1m4rtQHbchoC 0+wWaQpof33YLUypEJoZx9/PutL77uySTM71A= Received: by 10.101.138.10 with SMTP id q10mr1832534ann.37.1265611162652; Sun, 07 Feb 2010 22:39:22 -0800 (PST) Received: from rxone.opensource.se (49.14.32.202.bf.2iij.net [202.32.14.49]) by mx.google.com with ESMTPS id 15sm2709757gxk.12.2010.02.07.22.39.20 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 07 Feb 2010 22:39:21 -0800 (PST) From: Magnus Damm To: linux-input@vger.kernel.org Cc: Magnus Damm , lethal@linux-sh.org, dmitry.torokhov@gmail.com, linux-sh@vger.kernel.org Date: Mon, 08 Feb 2010 15:32:43 +0900 Message-Id: <20100208063243.2003.6889.sendpatchset@rxone.opensource.se> In-Reply-To: <20100208063216.2003.84260.sendpatchset@rxone.opensource.se> References: <20100208063216.2003.84260.sendpatchset@rxone.opensource.se> Subject: [PATCH 03/03] input: update sh_keysc driver with mode 6 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 08 Feb 2010 06:39:25 +0000 (UTC) --- 0006/drivers/input/keyboard/sh_keysc.c +++ work/drivers/input/keyboard/sh_keysc.c 2010-02-05 13:19:52.000000000 +0900 @@ -31,6 +31,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 }, }; struct sh_keysc_map { @@ -121,7 +122,7 @@ static irqreturn_t sh_keysc_isr(int irq, n = keyin_nr * i; /* drive one KEYOUT pin low, read KEYIN pins */ - sh_keysc_write(priv, KYOUTDR, 0xfff ^ (3 << (i * 2))); + sh_keysc_write(priv, KYOUTDR, 0xffff ^ (3 << (i * 2))); udelay(pdata->delay); tmp = sh_keysc_read(priv, KYINDR); --- 0004/include/linux/input/sh_keysc.h +++ work/include/linux/input/sh_keysc.h 2010-02-05 13:19:52.000000000 +0900 @@ -1,15 +1,15 @@ #ifndef __SH_KEYSC_H__ #define __SH_KEYSC_H__ -#define SH_KEYSC_MAXKEYS 42 +#define SH_KEYSC_MAXKEYS 49 struct sh_keysc_info { enum { SH_KEYSC_MODE_1, SH_KEYSC_MODE_2, SH_KEYSC_MODE_3, - SH_KEYSC_MODE_4, SH_KEYSC_MODE_5 } mode; + SH_KEYSC_MODE_4, SH_KEYSC_MODE_5, SH_KEYSC_MODE_6 } mode; int scan_timing; /* 0 -> 7, see KYCR1, SCN[2:0] */ int delay; int kycr2_delay; - int keycodes[SH_KEYSC_MAXKEYS]; + int keycodes[SH_KEYSC_MAXKEYS]; /* KEYIN * KEYOUT */ }; #endif /* __SH_KEYSC_H__ */