diff options
| author | Kuninori Morimoto <morimoto.kuninori@renesas.com> | 2009-09-15 00:21:34 +0000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-15 09:30:14 +0900 |
| commit | 1f85d381062a046fd8f3ddb654a5276266daf72c (patch) | |
| tree | 2fd3f42ede6f3272e21d02c3fd72adfb000b9e1d | |
| parent | 033eb0acddb71bbee32dce285256b3489b17ef7f (diff) | |
| download | kernel_samsung_tuna-1f85d381062a046fd8f3ddb654a5276266daf72c.zip kernel_samsung_tuna-1f85d381062a046fd8f3ddb654a5276266daf72c.tar.gz kernel_samsung_tuna-1f85d381062a046fd8f3ddb654a5276266daf72c.tar.bz2 | |
sh: add kycr2_delay for sh_keysc
After KYCR2 is set, udelay might become necessary if there are only a
small number of keys attached. This patch introduces an optional delay
through the platform data to address this problem.
Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | arch/sh/include/asm/sh_keysc.h | 1 | ||||
| -rw-r--r-- | drivers/input/keyboard/sh_keysc.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/sh/include/asm/sh_keysc.h b/arch/sh/include/asm/sh_keysc.h index b5a4dd5..4a65b1e 100644 --- a/arch/sh/include/asm/sh_keysc.h +++ b/arch/sh/include/asm/sh_keysc.h @@ -7,6 +7,7 @@ struct sh_keysc_info { enum { SH_KEYSC_MODE_1, SH_KEYSC_MODE_2, SH_KEYSC_MODE_3 } mode; int scan_timing; /* 0 -> 7, see KYCR1, SCN[2:0] */ int delay; + int kycr2_delay; int keycodes[SH_KEYSC_MAXKEYS]; }; diff --git a/drivers/input/keyboard/sh_keysc.c b/drivers/input/keyboard/sh_keysc.c index cea70e6..68fd502 100644 --- a/drivers/input/keyboard/sh_keysc.c +++ b/drivers/input/keyboard/sh_keysc.c @@ -80,6 +80,9 @@ static irqreturn_t sh_keysc_isr(int irq, void *dev_id) iowrite16(KYCR2_IRQ_LEVEL | (keyin_set << 8), priv->iomem_base + KYCR2_OFFS); + if (pdata->kycr2_delay) + udelay(pdata->kycr2_delay); + keys ^= ~0; keys &= (1 << (sh_keysc_mode[pdata->mode].keyin * sh_keysc_mode[pdata->mode].keyout)) - 1; |