* [PATCH] Input: imx_keypad - reset the hardware before enabling
@ 2012-08-20 15:34 Michael Grzeschik
2012-08-22 5:06 ` Dmitry Torokhov
0 siblings, 1 reply; 3+ messages in thread
From: Michael Grzeschik @ 2012-08-20 15:34 UTC (permalink / raw
To: dmitry.torokhov; +Cc: linux-input
assert the hardware is correctly initialized before requesting the
interrupt. Otherwise if a key was already touched since power-on the
kernel enters an interrupt loop. To fix this issue we clear pending
interrupt sources. We have to ensure to enable clks while changing the
keypad registers.
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
---
drivers/input/keyboard/imx_keypad.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c
index ff4c0a8..ce68e36 100644
--- a/drivers/input/keyboard/imx_keypad.c
+++ b/drivers/input/keyboard/imx_keypad.c
@@ -358,6 +358,7 @@ static void imx_keypad_inhibit(struct imx_keypad *keypad)
/* Inhibit KDI and KRI interrupts. */
reg_val = readw(keypad->mmio_base + KPSR);
reg_val &= ~(KBD_STAT_KRIE | KBD_STAT_KDIE);
+ reg_val |= KBD_STAT_KPKR | KBD_STAT_KPKD;
writew(reg_val, keypad->mmio_base + KPSR);
/* Colums as open drain and disable all rows */
@@ -515,7 +516,9 @@ static int __devinit imx_keypad_probe(struct platform_device *pdev)
input_set_drvdata(input_dev, keypad);
/* Ensure that the keypad will stay dormant until opened */
+ clk_enable(keypad->clk);
imx_keypad_inhibit(keypad);
+ clk_disable(keypad->clk);
error = request_irq(irq, imx_keypad_irq_handler, 0,
pdev->name, keypad);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] Input: imx_keypad - reset the hardware before enabling
@ 2012-08-20 21:34 Michael Grzeschik
0 siblings, 0 replies; 3+ messages in thread
From: Michael Grzeschik @ 2012-08-20 21:34 UTC (permalink / raw
To: dmitry.torokhov; +Cc: linux-input
assert the hardware is correctly initialized before requesting the
interrupt. Otherwise if a key was already touched since power-on the
kernel enters an interrupt loop. To fix this issue we clear pending
interrupt sources. We have to ensure to enable clks while changing the
keypad registers.
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
---
drivers/input/keyboard/imx_keypad.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c
index ff4c0a8..ce68e36 100644
--- a/drivers/input/keyboard/imx_keypad.c
+++ b/drivers/input/keyboard/imx_keypad.c
@@ -358,6 +358,7 @@ static void imx_keypad_inhibit(struct imx_keypad *keypad)
/* Inhibit KDI and KRI interrupts. */
reg_val = readw(keypad->mmio_base + KPSR);
reg_val &= ~(KBD_STAT_KRIE | KBD_STAT_KDIE);
+ reg_val |= KBD_STAT_KPKR | KBD_STAT_KPKD;
writew(reg_val, keypad->mmio_base + KPSR);
/* Colums as open drain and disable all rows */
@@ -515,7 +516,9 @@ static int __devinit imx_keypad_probe(struct platform_device *pdev)
input_set_drvdata(input_dev, keypad);
/* Ensure that the keypad will stay dormant until opened */
+ clk_enable(keypad->clk);
imx_keypad_inhibit(keypad);
+ clk_disable(keypad->clk);
error = request_irq(irq, imx_keypad_irq_handler, 0,
pdev->name, keypad);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Input: imx_keypad - reset the hardware before enabling
2012-08-20 15:34 Michael Grzeschik
@ 2012-08-22 5:06 ` Dmitry Torokhov
0 siblings, 0 replies; 3+ messages in thread
From: Dmitry Torokhov @ 2012-08-22 5:06 UTC (permalink / raw
To: Michael Grzeschik; +Cc: linux-input
On Mon, Aug 20, 2012 at 05:34:53PM +0200, Michael Grzeschik wrote:
> assert the hardware is correctly initialized before requesting the
> interrupt. Otherwise if a key was already touched since power-on the
> kernel enters an interrupt loop. To fix this issue we clear pending
> interrupt sources. We have to ensure to enable clks while changing the
> keypad registers.
>
> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Applied, thank you Michael.
--
Dmitry
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-08-22 5:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-20 21:34 [PATCH] Input: imx_keypad - reset the hardware before enabling Michael Grzeschik
-- strict thread matches above, loose matches on Subject: below --
2012-08-20 15:34 Michael Grzeschik
2012-08-22 5:06 ` Dmitry Torokhov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.