From patchwork Fri Nov 19 06:22:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kim, HeungJun" X-Patchwork-Id: 338581 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAJ6MW4N009362 for ; Fri, 19 Nov 2010 06:22:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750705Ab0KSGWb (ORCPT ); Fri, 19 Nov 2010 01:22:31 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:64347 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750704Ab0KSGWa (ORCPT ); Fri, 19 Nov 2010 01:22:30 -0500 Received: from epmmp1 (mailout2.samsung.com [203.254.224.25]) by mailout2.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0LC400FQ6CD586D0@mailout2.samsung.com> for linux-input@vger.kernel.org; Fri, 19 Nov 2010 15:22:18 +0900 (KST) Received: from TNRNDGASPAPP1.tn.corp.samsungelectronics.net ([165.213.149.150]) by mmp1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LC400HASCD540@mmp1.samsung.com> for linux-input@vger.kernel.org; Fri, 19 Nov 2010 15:22:17 +0900 (KST) Received: from [10.89.10.251] ([10.89.10.251]) by TNRNDGASPAPP1.tn.corp.samsungelectronics.net with Microsoft SMTPSVC(6.0.3790.4675); Fri, 19 Nov 2010 15:22:17 +0900 Date: Fri, 19 Nov 2010 15:22:18 +0900 From: "Kim, HeungJun" Subject: [PATCH v2 1/2] input: keyboard: MCS5080: support suspend/resume. To: "dmitry.torokhov@gmail.com" Cc: "linux-input@vger.kernel.org" , "kyungmin.park@samsung.com" , "Datta, Shubhrajyoti" Reply-to: riverful.kim@samsung.com Message-id: <4CE6179A.5050404@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=EUC-KR Content-transfer-encoding: 7BIT User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; ko; rv:1.9.2.12) Gecko/20101027 Thunderbird/3.1.6 X-OriginalArrivalTime: 19 Nov 2010 06:22:17.0923 (UTC) FILETIME=[1D82C930:01CB87B2] Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 19 Nov 2010 06:22:32 +0000 (UTC) diff --git a/drivers/input/keyboard/mcs_touchkey.c b/drivers/input/keyboard/mcs_touchkey.c index 63b849d..92149e4 100644 --- a/drivers/input/keyboard/mcs_touchkey.c +++ b/drivers/input/keyboard/mcs_touchkey.c @@ -19,6 +19,7 @@ #include #include #include +#include /* 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), diff --git a/include/linux/i2c/mcs.h b/include/linux/i2c/mcs.h index 725ae7c..61bb18a 100644 --- a/include/linux/i2c/mcs.h +++ b/include/linux/i2c/mcs.h @@ -18,6 +18,7 @@ #define MCS_KEY_CODE(v) ((v) & 0xffff) struct mcs_platform_data { + void (*poweron)(bool); void (*cfg_pin)(void); /* touchscreen */