diff options
author | Kuninori Morimoto <morimoto.kuninori@renesas.com> | 2009-09-14 20:21:34 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-14 20:30:14 -0400 |
commit | 1f85d381062a046fd8f3ddb654a5276266daf72c (patch) | |
tree | 2fd3f42ede6f3272e21d02c3fd72adfb000b9e1d /drivers/input | |
parent | 033eb0acddb71bbee32dce285256b3489b17ef7f (diff) |
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>
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/keyboard/sh_keysc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/keyboard/sh_keysc.c b/drivers/input/keyboard/sh_keysc.c index cea70e6a1031..68fd502fcfef 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) | |||
80 | iowrite16(KYCR2_IRQ_LEVEL | (keyin_set << 8), | 80 | iowrite16(KYCR2_IRQ_LEVEL | (keyin_set << 8), |
81 | priv->iomem_base + KYCR2_OFFS); | 81 | priv->iomem_base + KYCR2_OFFS); |
82 | 82 | ||
83 | if (pdata->kycr2_delay) | ||
84 | udelay(pdata->kycr2_delay); | ||
85 | |||
83 | keys ^= ~0; | 86 | keys ^= ~0; |
84 | keys &= (1 << (sh_keysc_mode[pdata->mode].keyin * | 87 | keys &= (1 << (sh_keysc_mode[pdata->mode].keyin * |
85 | sh_keysc_mode[pdata->mode].keyout)) - 1; | 88 | sh_keysc_mode[pdata->mode].keyout)) - 1; |