diff options
| author | Liviu Dudau <Liviu.Dudau@arm.com> | 2014-05-13 23:17:12 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-05-13 23:20:26 -0700 |
| commit | 5d61b54f5e06621d7b1471cbf8b76bc064117225 (patch) | |
| tree | e482480b3e18e0c888195d80af55cb81b6046109 /drivers/input/serio/ambakmi.c | |
| parent | c5ec1948eaab7c1c0f412b2804e65a637f1c7443 (diff) | |
| download | op-kernel-dev-5d61b54f5e06621d7b1471cbf8b76bc064117225.zip op-kernel-dev-5d61b54f5e06621d7b1471cbf8b76bc064117225.tar.gz | |
Input: ambakmi - request a shared interrupt for AMBA KMI devices
Recent ARM boards have the KMI devices share one interrupt line rather
than having dedicated IRQs. Update the driver to take that into account.
Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/serio/ambakmi.c')
| -rw-r--r-- | drivers/input/serio/ambakmi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c index 762b084..8b748d9 100644 --- a/drivers/input/serio/ambakmi.c +++ b/drivers/input/serio/ambakmi.c @@ -79,7 +79,8 @@ static int amba_kmi_open(struct serio *io) writeb(divisor, KMICLKDIV); writeb(KMICR_EN, KMICR); - ret = request_irq(kmi->irq, amba_kmi_int, 0, "kmi-pl050", kmi); + ret = request_irq(kmi->irq, amba_kmi_int, IRQF_SHARED, "kmi-pl050", + kmi); if (ret) { printk(KERN_ERR "kmi: failed to claim IRQ%d\n", kmi->irq); writeb(0, KMICR); |
