Skip to contentSkip to conversation

input: keyboard: MCS5080: support suspend/resume.

PATCH In review Kim, HeungJun 2 participants 3 messages Nov 19, 2010 – Dec 13, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 input: keyboard: MCS5080: support suspend/resume.

This patch supports suspend/resume functions for mcs5080 touchkey driver.

---
 drivers/input/keyboard/mcs_touchkey.c |   51 +++++++++++++++++++++++++++++++++
 include/linux/i2c/mcs.h               |    1 +
 2 files changed, 52 insertions(+), 0 deletions(-)
drivers/input/keyboard/mcs_touchkey.c +51 -0
index 63b849d..92149e4 100644
@@ -19,6 +19,7 @@
 #include <linux/input.h>
 #include <linux/irq.h>
 #include <linux/slab.h>
+#include <linux/pm_runtime.h>
 
 /* MCS5000 Touchkey */
 #define MCS5000_TOUCHKEY_STATUS		0x04
@@ -45,6 +46,8 @@ struct mcs_touchkey_chip {
 };
 
 struct mcs_touchkey_data {
+	void (*poweron)(bool);
+
 	struct i2c_client *client;
 	struct input_dev *input_dev;
 	struct mcs_touchkey_chip chip;
@@ -168,6 +171,10 @@ static int __devinit mcs_touchkey_probe(struct i2c_client *client,
 
 	if (pdata->cfg_pin)
 		pdata->cfg_pin();
+	if (pdata->poweron) {
+		data->poweron = pdata->poweron;
+		data->poweron(1);
+	}
 
 	error = request_threaded_irq(client->irq, NULL, mcs_touchkey_interrupt,
 			IRQF_TRIGGER_FALLING, client->dev.driver->name, data);
@@ -181,6 +188,9 @@ static int __devinit mcs_touchkey_probe(struct i2c_client *client,
 		goto err_free_irq;
 
 	i2c_set_clientdata(client, data);
+
+	pm_runtime_set_active(&client->dev);
+
 	return 0;
 
 err_free_irq:
@@ -202,6 +212,46 @@ static int __devexit mcs_touchkey_remove(struct i2c_client *client)
 	return 0;
 }
 
+#ifdef CONFIG_PM
+static int mcs_touchkey_suspend(struct device *dev)
+{
+	struct mcs_touchkey_data *data = dev_get_drvdata(dev);
+	struct i2c_client *client = data->client;
+
+	/* Disable the work */
+	disable_irq(client->irq);
+
+	/* Finally turn off the power */
+	if (data->poweron)
+		data->poweron(0);
+
+	return 0;
+}
+
+static int mcs_touchkey_resume(struct device *dev)
+{
+	struct mcs_touchkey_data *data = dev_get_drvdata(dev);
+	struct i2c_client *client = data->client;
+
+	/* Enable the device first */
+	if (data->poweron)
+		data->poweron(1);
+
+	/* Enable irq again */
+	enable_irq(client->irq);
+
+	return 0;
+}
+
+static const struct dev_pm_ops mcs_touchkey_pm_ops = {
+	.suspend		= mcs_touchkey_suspend,
+	.resume			= mcs_touchkey_resume,
+};
+#define MCS_TOUCHKEY_PM_OPS		(&mcs_touchkey_pm_ops)
+#else
+#define MCS_TOUCHKEY_PM_OPS		NULL
+#endif
+
 static const struct i2c_device_id mcs_touchkey_id[] = {
 	{ "mcs5000_touchkey", MCS5000_TOUCHKEY },
 	{ "mcs5080_touchkey", MCS5080_TOUCHKEY },
@@ -213,6 +263,7 @@ static struct i2c_driver mcs_touchkey_driver = {
 	.driver = {
 		.name	= "mcs_touchkey",
 		.owner	= THIS_MODULE,
+		.pm	= MCS_TOUCHKEY_PM_OPS,
 	},
 	.probe		= mcs_touchkey_probe,
 	.remove		= __devexit_p(mcs_touchkey_remove),
include/linux/i2c/mcs.h +1 -0
index 725ae7c..61bb18a 100644
@@ -18,6 +18,7 @@
 #define MCS_KEY_CODE(v)		((v) & 0xffff)
 
 struct mcs_platform_data {
+	void (*poweron)(bool);
 	void (*cfg_pin)(void);
 
 	/* touchscreen */
Signature · 1 line
1.7.0.4
maintainer
#1 lore raw

Hi Kim,

Quoted 3 lines · HeungJun

This patch supports suspend/resume functions for mcs5080 touchkey driver.

...

drivers/input/keyboard/mcs_touchkey.c static int __devinit mcs_touchkey_probe(struct i2c_client *client, · line 193

Quoted 7 lines
drivers/input/keyboard/mcs_touchkey.c +3 -0
@@ -181,6 +188,9 @@ static int __devinit mcs_touchkey_probe(struct i2c_client *client,
 		goto err_free_irq;
 
 	i2c_set_clientdata(client, data);
+
+	pm_runtime_set_active(&client->dev);
+

Why is this required? Won't this effectively disable PM suspend/resume?

Thanks.

Signature · 1 line
Dmitry
#2 lore raw

Hi Dmitry,

2010-12-13 오후 6:00, Dmitry Torokhov 쓴 글:

Quoted 11 lines

Hi Kim,

Quoted 3 lines · HeungJun

This patch supports suspend/resume functions for mcs5080 touchkey driver.

...

Quoted 3 lines
drivers/input/keyboard/mcs_touchkey.c +0 -0
@@ -181,6 +188,9 @@ static int __devinit mcs_touchkey_probe(struct i2c_client *client,
 		goto err_free_irq;
 
Quoted 6 lines

drivers/input/keyboard/mcs_touchkey.c static int __devinit mcs_touchkey_probe(struct i2c_client *client, · line 193

Quoted 4 lines
drivers/input/keyboard/mcs_touchkey.c +3 -0
 	i2c_set_clientdata(client, data);
+
+	pm_runtime_set_active(&client->dev);
+

Why is this required? Won't this effectively disable PM suspend/resume?

Actually, this part marks system as "ACTIVE".
So, I know that, if there is not this part, the pm framework skip previous suspend() or rumtime-pm suspend(), when the system into suspend doing like, # echo mem > /sys/power/state.
Then, this part is needed I think.

If I'm wrong, let me know.

Thank.

Regards,
HeungJun Kim
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html