Commit 1f85d381 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Paul Mundt

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: default avatarKuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 033eb0ac
...@@ -7,6 +7,7 @@ struct sh_keysc_info { ...@@ -7,6 +7,7 @@ struct sh_keysc_info {
enum { SH_KEYSC_MODE_1, SH_KEYSC_MODE_2, SH_KEYSC_MODE_3 } mode; 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 scan_timing; /* 0 -> 7, see KYCR1, SCN[2:0] */
int delay; int delay;
int kycr2_delay;
int keycodes[SH_KEYSC_MAXKEYS]; int keycodes[SH_KEYSC_MAXKEYS];
}; };
......
...@@ -80,6 +80,9 @@ static irqreturn_t sh_keysc_isr(int irq, void *dev_id) ...@@ -80,6 +80,9 @@ static irqreturn_t sh_keysc_isr(int irq, void *dev_id)
iowrite16(KYCR2_IRQ_LEVEL | (keyin_set << 8), iowrite16(KYCR2_IRQ_LEVEL | (keyin_set << 8),
priv->iomem_base + KYCR2_OFFS); priv->iomem_base + KYCR2_OFFS);
if (pdata->kycr2_delay)
udelay(pdata->kycr2_delay);
keys ^= ~0; keys ^= ~0;
keys &= (1 << (sh_keysc_mode[pdata->mode].keyin * keys &= (1 << (sh_keysc_mode[pdata->mode].keyin *
sh_keysc_mode[pdata->mode].keyout)) - 1; sh_keysc_mode[pdata->mode].keyout)) - 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment