mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
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>
This commit is contained in:
parent
033eb0acdd
commit
1f85d38106
2 changed files with 4 additions and 0 deletions
|
@ -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];
|
||||
};
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue