From: Magnus Damm <magnus.damm@gmail.com>
To: linux-input@vger.kernel.org
Cc: Magnus Damm <magnus.damm@gmail.com>,
lethal@linux-sh.org, dmitry.torokhov@gmail.com,
linux-sh@vger.kernel.org
Subject: [PATCH 03/03] input: update sh_keysc driver with mode 6
Date: Mon, 08 Feb 2010 06:32:43 +0000 [thread overview]
Message-ID: <20100208063243.2003.6889.sendpatchset@rxone.opensource.se> (raw)
In-Reply-To: <20100208063216.2003.84260.sendpatchset@rxone.opensource.se>
From: Magnus Damm <damm@opensource.se>
Add mode 6 support to the sh_keysc driver. Also update
the KYOUTDR mask value to include all 16 register bits.
Signed-off-by: Magnus Damm <damm@opensource.se>
---
drivers/input/keyboard/sh_keysc.c | 3 ++-
include/linux/input/sh_keysc.h | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
--- 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__ */
WARNING: multiple messages have this Message-ID (diff)
From: Magnus Damm <magnus.damm@gmail.com>
To: linux-input@vger.kernel.org
Cc: Magnus Damm <magnus.damm@gmail.com>,
lethal@linux-sh.org, dmitry.torokhov@gmail.com,
linux-sh@vger.kernel.org
Subject: [PATCH 03/03] input: update sh_keysc driver with mode 6
Date: Mon, 08 Feb 2010 15:32:43 +0900 [thread overview]
Message-ID: <20100208063243.2003.6889.sendpatchset@rxone.opensource.se> (raw)
In-Reply-To: <20100208063216.2003.84260.sendpatchset@rxone.opensource.se>
From: Magnus Damm <damm@opensource.se>
Add mode 6 support to the sh_keysc driver. Also update
the KYOUTDR mask value to include all 16 register bits.
Signed-off-by: Magnus Damm <damm@opensource.se>
---
drivers/input/keyboard/sh_keysc.c | 3 ++-
include/linux/input/sh_keysc.h | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
--- 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__ */
next prev parent reply other threads:[~2010-02-08 6:32 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-08 6:32 [PATCH 00/03] input: mode 6 patches for sh_keysc Magnus Damm
2010-02-08 6:32 ` Magnus Damm
2010-02-08 6:32 ` [PATCH 01/03] input: break out hw access functions in sh_keysc Magnus Damm
2010-02-08 6:32 ` Magnus Damm
2010-02-08 6:32 ` [PATCH 02/03] input: bitmap update for sh_keysc Magnus Damm
2010-02-08 6:32 ` Magnus Damm
2010-02-08 7:18 ` Dmitry Torokhov
2010-02-08 7:18 ` Dmitry Torokhov
2010-02-08 7:41 ` Magnus Damm
2010-02-08 7:41 ` Magnus Damm
2010-02-09 1:17 ` Paul Mundt
2010-02-09 1:17 ` Paul Mundt
2010-02-08 6:32 ` Magnus Damm [this message]
2010-02-08 6:32 ` [PATCH 03/03] input: update sh_keysc driver with mode 6 Magnus Damm
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100208063243.2003.6889.sendpatchset@rxone.opensource.se \
--to=magnus.damm@gmail.com \
--cc=dmitry.torokhov@gmail.com \
--cc=lethal@linux-sh.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.