Skip to contentSkip to conversation

input: keyboard: MCS5080: support suspend/resume.

PATCH Superseded Kim, HeungJun 3 participants 5 messages Nov 15, 2010 – Nov 18, 2010

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 input: keyboard: MCS5080: support suspend/resume.

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

---
 drivers/input/keyboard/mcs_touchkey.c |   41 +++++++++++++++++++++++++++++++++
 include/linux/i2c/mcs.h               |    1 +
 2 files changed, 42 insertions(+), 0 deletions(-)
drivers/input/keyboard/mcs_touchkey.c +41 -0
index 63b849d..06385f5 100644
@@ -45,6 +45,8 @@ struct mcs_touchkey_chip {
 };
 
 struct mcs_touchkey_data {
+       void (*poweron)(int);
+
        struct i2c_client *client;
        struct input_dev *input_dev;
        struct mcs_touchkey_chip chip;
@@ -168,6 +170,8 @@ static int __devinit mcs_touchkey_probe(struct i2c_client *client,
 
        if (pdata->cfg_pin)
                pdata->cfg_pin();
+       if (pdata->poweron)
+               data->poweron = pdata->poweron;
 
        error = request_threaded_irq(client->irq, NULL, mcs_touchkey_interrupt,
                        IRQF_TRIGGER_FALLING, client->dev.driver->name, data);
@@ -202,6 +206,41 @@ static int __devexit mcs_touchkey_remove(struct i2c_client *client)
        return 0;
 }
 
+#ifdef CONFIG_PM
+static int mcs_touchkey_suspend(struct i2c_client *client, pm_message_t mesg)
+{
+       struct mcs_touchkey_data *data = i2c_get_clientdata(client);
+
+       /* Disable the work */
+       disable_irq(client->irq);
+
+       /* Don't I2C operation since we don't know I2C bus is dead already */
+
+       /* Finally turn off the power */
+       if (data->poweron)
+               data->poweron(0);
+
+       return 0;
+}
+
+static int mcs_touchkey_resume(struct i2c_client *client)
+{
+       struct mcs_touchkey_data *data = i2c_get_clientdata(client);
+
+       /* Enable the device first */
+       if (data->poweron)
+               data->poweron(1);
+
+       /* Enable irq again */
+       enable_irq(client->irq);
+
+       return 0;
+}
+#else
+#define mcs_touchkey_suspend   NULL
+#define mcs_touchkey_resume    NULL
+#endif
+
 static const struct i2c_device_id mcs_touchkey_id[] = {
        { "mcs5000_touchkey", MCS5000_TOUCHKEY },
        { "mcs5080_touchkey", MCS5080_TOUCHKEY },
@@ -216,6 +255,8 @@ static struct i2c_driver mcs_touchkey_driver = {
        },
        .probe          = mcs_touchkey_probe,
        .remove         = __devexit_p(mcs_touchkey_remove),
+       .suspend        = mcs_touchkey_suspend,
+       .resume         = mcs_touchkey_resume,
        .id_table       = mcs_touchkey_id,
 };
 
include/linux/i2c/mcs.h +1 -0
index 725ae7c..c4a3869 100644
@@ -18,6 +18,7 @@
 #define MCS_KEY_CODE(v)                ((v) & 0xffff)
 
 struct mcs_platform_data {
+       void (*poweron)(int);
        void (*cfg_pin)(void);
 
        /* touchscreen */

--
1.7.0.4

#1 lore raw

Hi Kim,

Quoted 25 lines

-----Original Message-----
From: [email protected] [mailto:linux-input- [email protected]] On Behalf Of Kim, HeungJun
Sent: Monday, November 15, 2010 10:02 AM
To: [email protected]; [email protected]
Cc: [email protected]
Subject: [PATCH 1/3] input: keyboard: MCS5080: support suspend/resume.

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

---
 drivers/input/keyboard/mcs_touchkey.c |   41
+++++++++++++++++++++++++++++++++
 include/linux/i2c/mcs.h               |    1 +
 2 files changed, 42 insertions(+), 0 deletions(-)
drivers/input/keyboard/mcs_touchkey.c +0 -0
index 63b849d..06385f5 100644

drivers/input/keyboard/mcs_touchkey.c struct mcs_touchkey_chip { · line 48

Quoted 4 lines
drivers/input/keyboard/mcs_touchkey.c +1 -0
@@ -45,6 +45,8 @@ struct mcs_touchkey_chip {
 };
 
 struct mcs_touchkey_data {
+       void (*poweron)(int);

Could you explain what it does?

drivers/input/keyboard/mcs_touchkey.c static int __devinit mcs_touchkey_probe(struct · line 175

Quoted 11 lines
drivers/input/keyboard/mcs_touchkey.c +3 -0
+
        struct i2c_client *client;
        struct input_dev *input_dev;
        struct mcs_touchkey_chip chip;
@@ -168,6 +170,8 @@ static int __devinit mcs_touchkey_probe(struct
 i2c_client *client,
 
        if (pdata->cfg_pin)
                pdata->cfg_pin();
+       if (pdata->poweron)
+               data->poweron = pdata->poweron;

Where is it called the first time?

Quoted 77 lines
drivers/input/keyboard/mcs_touchkey.c +0 -0
        error = request_threaded_irq(client->irq, NULL,
 mcs_touchkey_interrupt,
                        IRQF_TRIGGER_FALLING, client->dev.driver->name,

data);

drivers/input/keyboard/mcs_touchkey.c +35 -0
@@ -202,6 +206,41 @@ static int __devexit mcs_touchkey_remove(struct
 i2c_client *client)
        return 0;
 }
 
+#ifdef CONFIG_PM
+static int mcs_touchkey_suspend(struct i2c_client *client, pm_message_t
 mesg)
+{
+       struct mcs_touchkey_data *data = i2c_get_clientdata(client);
+
+       /* Disable the work */
+       disable_irq(client->irq);
+
+       /* Don't I2C operation since we don't know I2C bus is dead already
 */
+
+       /* Finally turn off the power */
+       if (data->poweron)
+               data->poweron(0);
+
+       return 0;
+}
+
+static int mcs_touchkey_resume(struct i2c_client *client)
+{
+       struct mcs_touchkey_data *data = i2c_get_clientdata(client);
+
+       /* Enable the device first */
+       if (data->poweron)
+               data->poweron(1);
+
+       /* Enable irq again */
+       enable_irq(client->irq);
+
+       return 0;
+}
+#else
+#define mcs_touchkey_suspend   NULL
+#define mcs_touchkey_resume    NULL
+#endif
+
 static const struct i2c_device_id mcs_touchkey_id[] = {
        { "mcs5000_touchkey", MCS5000_TOUCHKEY },
        { "mcs5080_touchkey", MCS5080_TOUCHKEY },
drivers/input/keyboard/mcs_touchkey.c +2 -0
@@ -216,6 +255,8 @@ static struct i2c_driver mcs_touchkey_driver = {
        },
        .probe          = mcs_touchkey_probe,
        .remove         = __devexit_p(mcs_touchkey_remove),
+       .suspend        = mcs_touchkey_suspend,
+       .resume         = mcs_touchkey_resume,
        .id_table       = mcs_touchkey_id,
 };
 
include/linux/i2c/mcs.h +1 -1
index 725ae7c..c4a3869 100644
@@ -18,6 +18,7 @@
 #define MCS_KEY_CODE(v)                ((v) & 0xffff)
 
 struct mcs_platform_data {
+       void (*poweron)(int);
        void (*cfg_pin)(void);
 
        /* touchscreen */
--

1.7.0.4
--
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

#2 lore raw

Hi shubhrajyoti,

2010-11-15 오후 2:43, Datta, Shubhrajyoti 쓴 글:

Quoted 29 lines

Hi Kim,

Quoted 27 lines

-----Original Message-----
From: [email protected] [mailto:linux-input- [email protected]] On Behalf Of Kim, HeungJun
Sent: Monday, November 15, 2010 10:02 AM
To: [email protected]; [email protected]
Cc: [email protected]
Subject: [PATCH 1/3] input: keyboard: MCS5080: support suspend/resume.

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

---
 drivers/input/keyboard/mcs_touchkey.c |   41
+++++++++++++++++++++++++++++++++
 include/linux/i2c/mcs.h               |    1 +
 2 files changed, 42 insertions(+), 0 deletions(-)
drivers/input/keyboard/mcs_touchkey.c +0 -0
index 63b849d..06385f5 100644
@@ -45,6 +45,8 @@ struct mcs_touchkey_chip {
 };
 
Quoted 3 lines

drivers/input/keyboard/mcs_touchkey.c struct mcs_touchkey_chip { · line 48

Quoted 2 lines
drivers/input/keyboard/mcs_touchkey.c +1 -0
 struct mcs_touchkey_data {
+       void (*poweron)(int);

Could you explain what it does?

The MCS5080 chip has enable or poweron key, or may be LDO pins. So, it used in the platformdata, like above cfg_pin().

There is one reason about using poweron().
The MCS5080 chip must be re-initialize after resume().
If it's not used power off/on method and use only disable/enable irq, it happened that it dosen't issued interrupt.
This is chip-level issue.

So, I think that it's the very simplest method to support poweron() function to machine or platform data.

Quoted 8 lines
Quoted 8 lines
drivers/input/keyboard/mcs_touchkey.c +1 -0
+
        struct i2c_client *client;
        struct input_dev *input_dev;
        struct mcs_touchkey_chip chip;
@@ -168,6 +170,8 @@ static int __devinit mcs_touchkey_probe(struct
 i2c_client *client,
 
Quoted 5 lines

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

Quoted 4 lines
drivers/input/keyboard/mcs_touchkey.c +2 -0
        if (pdata->cfg_pin)
                pdata->cfg_pin();
+       if (pdata->poweron)
+               data->poweron = pdata->poweron;

Where is it called the first time?

Actually, in the suspend(), this function called the first time. but, the actual power-up() sequence is possible in the cfg_pin(), too. So, I use this method.

Quoted 71 lines
Quoted 71 lines
drivers/input/keyboard/mcs_touchkey.c +0 -0
        error = request_threaded_irq(client->irq, NULL,
 mcs_touchkey_interrupt,
                        IRQF_TRIGGER_FALLING, client->dev.driver->name,

data);

drivers/input/keyboard/mcs_touchkey.c +35 -0
@@ -202,6 +206,41 @@ static int __devexit mcs_touchkey_remove(struct
 i2c_client *client)
        return 0;
 }
 
+#ifdef CONFIG_PM
+static int mcs_touchkey_suspend(struct i2c_client *client, pm_message_t
 mesg)
+{
+       struct mcs_touchkey_data *data = i2c_get_clientdata(client);
+
+       /* Disable the work */
+       disable_irq(client->irq);
+
+       /* Don't I2C operation since we don't know I2C bus is dead already
 */
+
+       /* Finally turn off the power */
+       if (data->poweron)
+               data->poweron(0);
+
+       return 0;
+}
+
+static int mcs_touchkey_resume(struct i2c_client *client)
+{
+       struct mcs_touchkey_data *data = i2c_get_clientdata(client);
+
+       /* Enable the device first */
+       if (data->poweron)
+               data->poweron(1);
+
+       /* Enable irq again */
+       enable_irq(client->irq);
+
+       return 0;
+}
+#else
+#define mcs_touchkey_suspend   NULL
+#define mcs_touchkey_resume    NULL
+#endif
+
 static const struct i2c_device_id mcs_touchkey_id[] = {
        { "mcs5000_touchkey", MCS5000_TOUCHKEY },
        { "mcs5080_touchkey", MCS5080_TOUCHKEY },
drivers/input/keyboard/mcs_touchkey.c +2 -0
@@ -216,6 +255,8 @@ static struct i2c_driver mcs_touchkey_driver = {
        },
        .probe          = mcs_touchkey_probe,
        .remove         = __devexit_p(mcs_touchkey_remove),
+       .suspend        = mcs_touchkey_suspend,
+       .resume         = mcs_touchkey_resume,
        .id_table       = mcs_touchkey_id,
 };
 
include/linux/i2c/mcs.h +1 -0
index 725ae7c..c4a3869 100644
@@ -18,6 +18,7 @@
 #define MCS_KEY_CODE(v)                ((v) & 0xffff)
 
 struct mcs_platform_data {
+       void (*poweron)(int);
        void (*cfg_pin)(void);
 
Quoted 7 lines
Quoted 7 lines
include/linux/i2c/mcs.h +0 -1
        /* touchscreen */
--

1.7.0.4
--
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

Thanks.
If u any ideas, let me know.

Regards,
Heundjun 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

maintainer
#3 lore raw
In reply to Kim, HeungJun

Hi Kim,

Quoted 15 lines · HeungJun

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

---
 drivers/input/keyboard/mcs_touchkey.c |   41 +++++++++++++++++++++++++++++++++
 include/linux/i2c/mcs.h               |    1 +
 2 files changed, 42 insertions(+), 0 deletions(-)
drivers/input/keyboard/mcs_touchkey.c +0 -0
index 63b849d..06385f5 100644

drivers/input/keyboard/mcs_touchkey.c struct mcs_touchkey_chip { · line 48

Quoted 4 lines
drivers/input/keyboard/mcs_touchkey.c +1 -0
@@ -45,6 +45,8 @@ struct mcs_touchkey_chip {
 };
 
 struct mcs_touchkey_data {
+       void (*poweron)(int);

int (*poweron)(bool);

The method must be able to signal errors.

Quoted 14 lines
drivers/input/keyboard/mcs_touchkey.c +3 -0
+
        struct i2c_client *client;
        struct input_dev *input_dev;
        struct mcs_touchkey_chip chip;
@@ -168,6 +170,8 @@ static int __devinit mcs_touchkey_probe(struct i2c_client *client,
 
        if (pdata->cfg_pin)
                pdata->cfg_pin();
+       if (pdata->poweron)
+               data->poweron = pdata->poweron;
 
        error = request_threaded_irq(client->irq, NULL, mcs_touchkey_interrupt,
                        IRQF_TRIGGER_FALLING, client->dev.driver->name, data);

drivers/input/keyboard/mcs_touchkey.c static int __devexit mcs_touchkey_remove(struct i2c_client *client) · line 210

Quoted 5 lines
drivers/input/keyboard/mcs_touchkey.c +2 -0
@@ -202,6 +206,41 @@ static int __devexit mcs_touchkey_remove(struct i2c_client *client)
        return 0;
 }
 
+#ifdef CONFIG_PM
+static int mcs_touchkey_suspend(struct i2c_client *client, pm_message_t mesg)

Newer code should use dev_pm_ops please.
`

drivers/input/keyboard/mcs_touchkey.c static int __devexit mcs_touchkey_remove(struct i2c_client *client) · line 217

Quoted 7 lines
drivers/input/keyboard/mcs_touchkey.c +7 -0
+{
+       struct mcs_touchkey_data *data = i2c_get_clientdata(client);
+
+       /* Disable the work */
+       disable_irq(client->irq);
+
+       /* Don't I2C operation since we don't know I2C bus is dead already */

? I am not quite sure what you are trying to say here...

Quoted 51 lines
drivers/input/keyboard/mcs_touchkey.c +28 -0
+
+       /* Finally turn off the power */
+       if (data->poweron)
+               data->poweron(0);
+
+       return 0;
+}
+
+static int mcs_touchkey_resume(struct i2c_client *client)
+{
+       struct mcs_touchkey_data *data = i2c_get_clientdata(client);
+
+       /* Enable the device first */
+       if (data->poweron)
+               data->poweron(1);
+
+       /* Enable irq again */
+       enable_irq(client->irq);
+
+       return 0;
+}
+#else
+#define mcs_touchkey_suspend   NULL
+#define mcs_touchkey_resume    NULL
+#endif
+
 static const struct i2c_device_id mcs_touchkey_id[] = {
        { "mcs5000_touchkey", MCS5000_TOUCHKEY },
        { "mcs5080_touchkey", MCS5080_TOUCHKEY },
@@ -216,6 +255,8 @@ static struct i2c_driver mcs_touchkey_driver = {
        },
        .probe          = mcs_touchkey_probe,
        .remove         = __devexit_p(mcs_touchkey_remove),
+       .suspend        = mcs_touchkey_suspend,
+       .resume         = mcs_touchkey_resume,
        .id_table       = mcs_touchkey_id,
 };
 
include/linux/i2c/mcs.h +1 -1
index 725ae7c..c4a3869 100644
@@ -18,6 +18,7 @@
 #define MCS_KEY_CODE(v)                ((v) & 0xffff)
 
 struct mcs_platform_data {
+       void (*poweron)(int);
        void (*cfg_pin)(void);
 
        /* touchscreen */
--
Quoted 1 line

1.7.0.4

Shouldn't you call poweron() at driver bind and unbind time (if you do not want to supply open() and close() methods which wold be the best option)?

Thanks.

Signature · 1 line
Dmitry
#4 lore raw

Hi Dmitry,

I'll fix the following points, and re-send patches, soon.
And, I gonna send the led-trigger patch, later.
Actually, the led-blink command & method is changed according to touchkey F/W, as you know. The cause of my sending led-patch is that I think it's the just basic function. But, If the touchkey-drv use led-trigger framework, the driver code is heavy, I guess.

After I consider that deeply, I'll re-send patch.

Thansk to review.

2010-11-15 오후 5:32, Dmitry Torokhov 쓴 글:

Quoted 20 lines

Hi Kim,

Quoted 17 lines · HeungJun

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

---
 drivers/input/keyboard/mcs_touchkey.c |   41 +++++++++++++++++++++++++++++++++
 include/linux/i2c/mcs.h               |    1 +
 2 files changed, 42 insertions(+), 0 deletions(-)
drivers/input/keyboard/mcs_touchkey.c +0 -0
index 63b849d..06385f5 100644
@@ -45,6 +45,8 @@ struct mcs_touchkey_chip {
 };
 
Quoted 6 lines

drivers/input/keyboard/mcs_touchkey.c struct mcs_touchkey_chip { · line 48

Quoted 2 lines
drivers/input/keyboard/mcs_touchkey.c +1 -0
 struct mcs_touchkey_data {
+       void (*poweron)(int);

int (*poweron)(bool);

The method must be able to signal errors.

Ok, I'll fix this.

Quoted 18 lines
Quoted 18 lines
drivers/input/keyboard/mcs_touchkey.c +3 -0
+
        struct i2c_client *client;
        struct input_dev *input_dev;
        struct mcs_touchkey_chip chip;
@@ -168,6 +170,8 @@ static int __devinit mcs_touchkey_probe(struct i2c_client *client,
 
        if (pdata->cfg_pin)
                pdata->cfg_pin();
+       if (pdata->poweron)
+               data->poweron = pdata->poweron;
 
        error = request_threaded_irq(client->irq, NULL, mcs_touchkey_interrupt,
                        IRQF_TRIGGER_FALLING, client->dev.driver->name, data);
@@ -202,6 +206,41 @@ static int __devexit mcs_touchkey_remove(struct i2c_client *client)
        return 0;
 }
 
Quoted 4 lines

drivers/input/keyboard/mcs_touchkey.c static int __devexit mcs_touchkey_remove(struct i2c_client *client) · line 210

Quoted 2 lines
drivers/input/keyboard/mcs_touchkey.c +2 -0
+#ifdef CONFIG_PM
+static int mcs_touchkey_suspend(struct i2c_client *client, pm_message_t mesg)

Newer code should use dev_pm_ops please.

I got it. I'll adapt new runtime-pm framework.

Quoted 10 lines

`

drivers/input/keyboard/mcs_touchkey.c static int __devexit mcs_touchkey_remove(struct i2c_client *client) · line 217

Quoted 7 lines
drivers/input/keyboard/mcs_touchkey.c +7 -0
+{
+       struct mcs_touchkey_data *data = i2c_get_clientdata(client);
+
+       /* Disable the work */
+       disable_irq(client->irq);
+
+       /* Don't I2C operation since we don't know I2C bus is dead already */

? I am not quite sure what you are trying to say here...

It's kind of defensive(?) code for sure.
If don't use this code and the I2C operation is crashed once, after I2C operation is crashed, too.
It happened very frequently in the MCS5080 chip. But fortunatly, It affects just own bus, not any other one.

Quoted 50 lines
Quoted 50 lines
drivers/input/keyboard/mcs_touchkey.c +28 -0
+
+       /* Finally turn off the power */
+       if (data->poweron)
+               data->poweron(0);
+
+       return 0;
+}
+
+static int mcs_touchkey_resume(struct i2c_client *client)
+{
+       struct mcs_touchkey_data *data = i2c_get_clientdata(client);
+
+       /* Enable the device first */
+       if (data->poweron)
+               data->poweron(1);
+
+       /* Enable irq again */
+       enable_irq(client->irq);
+
+       return 0;
+}
+#else
+#define mcs_touchkey_suspend   NULL
+#define mcs_touchkey_resume    NULL
+#endif
+
 static const struct i2c_device_id mcs_touchkey_id[] = {
        { "mcs5000_touchkey", MCS5000_TOUCHKEY },
        { "mcs5080_touchkey", MCS5080_TOUCHKEY },
@@ -216,6 +255,8 @@ static struct i2c_driver mcs_touchkey_driver = {
        },
        .probe          = mcs_touchkey_probe,
        .remove         = __devexit_p(mcs_touchkey_remove),
+       .suspend        = mcs_touchkey_suspend,
+       .resume         = mcs_touchkey_resume,
        .id_table       = mcs_touchkey_id,
 };
 
include/linux/i2c/mcs.h +1 -0
index 725ae7c..c4a3869 100644
@@ -18,6 +18,7 @@
 #define MCS_KEY_CODE(v)                ((v) & 0xffff)
 
 struct mcs_platform_data {
+       void (*poweron)(int);
        void (*cfg_pin)(void);
 
Quoted 6 lines
Quoted 3 lines
include/linux/i2c/mcs.h +0 -1
        /* touchscreen */
--

1.7.0.4

Shouldn't you call poweron() at driver bind and unbind time (if you do not want to supply open() and close() methods which wold be the best option)?

I got it. I'll locate poweron() function at the bind & unbind time.

Quoted 3 lines

Thanks.

Regards,
HeundJun 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