Commit 02db1749 authored by Andreas Kemnade's avatar Andreas Kemnade Committed by Dmitry Torokhov

Input: omap4-keypad - react on keypresses if device is runtime-suspended

According to SWPU235AB, table 26-6, fclk is required to generate events
at least on OMAP4460, so keep fclk enabled all the time the device
is opened.
Suggested-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarAndreas Kemnade <andreas@kemnade.info>
Reviewed-by: default avatarTony Lindgren <tony@atomide.com>
Link: https://lore.kernel.org/r/20231211221757.517427-1-andreas@kemnade.infoSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 90948416
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/clk.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/of.h> #include <linux/of.h>
...@@ -83,6 +84,7 @@ struct omap4_keypad { ...@@ -83,6 +84,7 @@ struct omap4_keypad {
bool no_autorepeat; bool no_autorepeat;
u64 keys; u64 keys;
unsigned short *keymap; unsigned short *keymap;
struct clk *fck;
}; };
static int kbd_readl(struct omap4_keypad *keypad_data, u32 offset) static int kbd_readl(struct omap4_keypad *keypad_data, u32 offset)
...@@ -209,6 +211,10 @@ static int omap4_keypad_open(struct input_dev *input) ...@@ -209,6 +211,10 @@ static int omap4_keypad_open(struct input_dev *input)
if (error) if (error)
return error; return error;
error = clk_prepare_enable(keypad_data->fck);
if (error)
goto out;
disable_irq(keypad_data->irq); disable_irq(keypad_data->irq);
kbd_writel(keypad_data, OMAP4_KBD_CTRL, kbd_writel(keypad_data, OMAP4_KBD_CTRL,
...@@ -226,10 +232,11 @@ static int omap4_keypad_open(struct input_dev *input) ...@@ -226,10 +232,11 @@ static int omap4_keypad_open(struct input_dev *input)
enable_irq(keypad_data->irq); enable_irq(keypad_data->irq);
out:
pm_runtime_mark_last_busy(dev); pm_runtime_mark_last_busy(dev);
pm_runtime_put_autosuspend(dev); pm_runtime_put_autosuspend(dev);
return 0; return error;
} }
static void omap4_keypad_stop(struct omap4_keypad *keypad_data) static void omap4_keypad_stop(struct omap4_keypad *keypad_data)
...@@ -258,6 +265,7 @@ static void omap4_keypad_close(struct input_dev *input) ...@@ -258,6 +265,7 @@ static void omap4_keypad_close(struct input_dev *input)
disable_irq(keypad_data->irq); disable_irq(keypad_data->irq);
omap4_keypad_stop(keypad_data); omap4_keypad_stop(keypad_data);
enable_irq(keypad_data->irq); enable_irq(keypad_data->irq);
clk_disable_unprepare(keypad_data->fck);
pm_runtime_mark_last_busy(dev); pm_runtime_mark_last_busy(dev);
pm_runtime_put_autosuspend(dev); pm_runtime_put_autosuspend(dev);
...@@ -356,6 +364,11 @@ static int omap4_keypad_probe(struct platform_device *pdev) ...@@ -356,6 +364,11 @@ static int omap4_keypad_probe(struct platform_device *pdev)
} }
keypad_data->irq = irq; keypad_data->irq = irq;
keypad_data->fck = devm_clk_get(&pdev->dev, "fck");
if (IS_ERR(keypad_data->fck))
return dev_err_probe(&pdev->dev, PTR_ERR(keypad_data->fck),
"unable to get fck");
mutex_init(&keypad_data->lock); mutex_init(&keypad_data->lock);
platform_set_drvdata(pdev, keypad_data); platform_set_drvdata(pdev, keypad_data);
......
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