From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lee Jones Subject: Re: [PATCH 2/2] input: gpio-keys: Add runtime support Date: Thu, 22 Nov 2012 14:51:53 +0000 Message-ID: <20121122145153.GB10986@gmail.com> References: <1353590617-11466-1-git-send-email-lee.jones@linaro.org> <1353590617-11466-2-git-send-email-lee.jones@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <1353590617-11466-2-git-send-email-lee.jones@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: linus.walleij@stericsson.com, Jonas Aaberg , Philippe Langlais , Dmitry Torokhov , arnd@arndb.de, linux-input@vger.kernel.org List-Id: linux-input@vger.kernel.org SWdub3JlIHRoaXMuCgpJJ3ZlIGp1c3QgcmViYXNlZCBhbmQgdGhlIEFQSSBoYXMgY2hhbmdlZCBz bGlnaHRseS4KCldpbGwgZml4dXAgYW5kIHJlc2VuZC4KCj4gRnJvbTogSm9uYXMgQWFiZXJnIDxq b25hcy5hYmVyZ0BzdGVyaWNzc29uLmNvbT4KPiAKPiBDYzogRG1pdHJ5IFRvcm9raG92IDxkbWl0 cnkudG9yb2tob3ZAZ21haWwuY29tPgo+IENjOiBsaW51eC1pbnB1dEB2Z2VyLmtlcm5lbC5vcmcK PiBTaWduZWQtb2ZmLWJ5OiBMZWUgSm9uZXMgPGxlZS5qb25lc0BsaW5hcm8ub3JnPgo+IFNpZ25l ZC1vZmYtYnk6IEpvbmFzIEFhYmVyZyA8am9uYXMuYWJlcmdAc3Rlcmljc3Nvbi5jb20+Cj4gU2ln bmVkLW9mZi1ieTogUGhpbGlwcGUgTGFuZ2xhaXMgPHBoaWxpcHBlLmxhbmdsYWlzQGxpbmFyby5v cmc+Cj4gUmV2aWV3ZWQtYnk6IEJlbmd0IEpvbnNzb24gPGJlbmd0Lmcuam9uc3NvbkBzdGVyaWNz c29uLmNvbT4KPiAtLS0KPiAgZHJpdmVycy9pbnB1dC9rZXlib2FyZC9ncGlvX2tleXMuYyB8ICAg MTcgKysrKysrKysrKysrKy0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDEzIGluc2VydGlvbnMoKyks IDQgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvaW5wdXQva2V5Ym9hcmQv Z3Bpb19rZXlzLmMgYi9kcml2ZXJzL2lucHV0L2tleWJvYXJkL2dwaW9fa2V5cy5jCj4gaW5kZXgg MmNmNjc1Ny4uY2ZmNTQ4YyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2lucHV0L2tleWJvYXJkL2dw aW9fa2V5cy5jCj4gKysrIGIvZHJpdmVycy9pbnB1dC9rZXlib2FyZC9ncGlvX2tleXMuYwo+IEBA IC0yOSw2ICsyOSw3IEBACj4gICNpbmNsdWRlIDxsaW51eC9vZl9wbGF0Zm9ybS5oPgo+ICAjaW5j bHVkZSA8bGludXgvb2ZfZ3Bpby5oPgo+ICAjaW5jbHVkZSA8bGludXgvc3BpbmxvY2suaD4KPiAr I2luY2x1ZGUgPGxpbnV4L3BtX3J1bnRpbWUuaD4KPiAgCj4gIHN0cnVjdCBncGlvX2J1dHRvbl9k YXRhIHsKPiAgCWNvbnN0IHN0cnVjdCBncGlvX2tleXNfYnV0dG9uICpidXR0b247Cj4gQEAgLTUz Myw2ICs1MzQsNyBAQCBzdGF0aWMgaW50IGdwaW9fa2V5c19vcGVuKHN0cnVjdCBpbnB1dF9kZXYg KmlucHV0KQo+ICAJc3RydWN0IGdwaW9fa2V5c19kcnZkYXRhICpkZGF0YSA9IGlucHV0X2dldF9k cnZkYXRhKGlucHV0KTsKPiAgCWNvbnN0IHN0cnVjdCBncGlvX2tleXNfcGxhdGZvcm1fZGF0YSAq cGRhdGEgPSBkZGF0YS0+cGRhdGE7Cj4gIAo+ICsJcG1fcnVudGltZV9nZXRfc3luYyhpbnB1dC0+ ZGV2LnBhcmVudCk7Cj4gIAlkZGF0YS0+ZW5hYmxlZCA9IHRydWU7Cj4gIAo+ICAJcmV0dXJuIHBk YXRhLT5lbmFibGUgPyBwZGF0YS0+ZW5hYmxlKGlucHV0LT5kZXYucGFyZW50KSA6IDA7Cj4gQEAg LTU0Nyw2ICs1NDksOCBAQCBzdGF0aWMgdm9pZCBncGlvX2tleXNfY2xvc2Uoc3RydWN0IGlucHV0 X2RldiAqaW5wdXQpCj4gIAo+ICAJaWYgKHBkYXRhLT5kaXNhYmxlKQo+ICAJCXBkYXRhLT5kaXNh YmxlKGlucHV0LT5kZXYucGFyZW50KTsKPiArCj4gKwlwbV9ydW50aW1lX3B1dChpbnB1dC0+ZGV2 LnBhcmVudCk7Cj4gIH0KPiAgCj4gIC8qCj4gQEAgLTcwOCw2ICs3MTIsOCBAQCBzdGF0aWMgaW50 IF9fZGV2aW5pdCBncGlvX2tleXNfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikK PiAgCWlucHV0LT5pZC5wcm9kdWN0ID0gMHgwMDAxOwo+ICAJaW5wdXQtPmlkLnZlcnNpb24gPSAw eDAxMDA7Cj4gIAo+ICsJcG1fcnVudGltZV9lbmFibGUoJnBkZXYtPmRldik7Cj4gKwo+ICAJLyog RW5hYmxlIGF1dG8gcmVwZWF0IGZlYXR1cmUgb2YgTGludXggaW5wdXQgc3Vic3lzdGVtICovCj4g IAlpZiAocGRhdGEtPnJlcCkKPiAgCQlfX3NldF9iaXQoRVZfUkVQLCBpbnB1dC0+ZXZiaXQpOwo+ IEBAIC03NzMsNiArNzc5LDggQEAgc3RhdGljIGludCBfX2RldmV4aXQgZ3Bpb19rZXlzX3JlbW92 ZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQo+ICAJc3RydWN0IGlucHV0X2RldiAqaW5w dXQgPSBkZGF0YS0+aW5wdXQ7Cj4gIAlpbnQgaTsKPiAgCj4gKwlwbV9ydW50aW1lX2Rpc2FibGUo JnBkZXYtPmRldik7Cj4gKwo+ICAJc3lzZnNfcmVtb3ZlX2dyb3VwKCZwZGV2LT5kZXYua29iaiwg JmdwaW9fa2V5c19hdHRyX2dyb3VwKTsKPiAgCj4gIAlkZXZpY2VfaW5pdF93YWtldXAoJnBkZXYt PmRldiwgMCk7Cj4gQEAgLTgwNSw4ICs4MTMsOCBAQCBzdGF0aWMgaW50IGdwaW9fa2V5c19zdXNw ZW5kKHN0cnVjdCBkZXZpY2UgKmRldikKPiAgCQl9Cj4gIAl9IGVsc2Ugewo+ICAJCWRkYXRhLT5l bmFibGVfYWZ0ZXJfc3VzcGVuZCA9IGRkYXRhLT5lbmFibGVkOwo+IC0JCWlmIChkZGF0YS0+ZW5h YmxlZCkKPiAtCQkJZ3Bpb19rZXlzX2Nsb3NlKGRkYXRhLT5pbnB1dCk7Cj4gKwkJaWYgKGRkYXRh LT5lbmFibGVkICYmIGRkYXRhLT5kaXNhYmxlKQo+ICsJCQlkZGF0YS0+ZGlzYWJsZShkZXYpOwo+ ICAJfQo+ICAKPiAgCXJldHVybiAwOwo+IEBAIC04MjYsOCArODM0LDkgQEAgc3RhdGljIGludCBn cGlvX2tleXNfcmVzdW1lKHN0cnVjdCBkZXZpY2UgKmRldikKPiAgCQkJZ3Bpb19rZXlzX2dwaW9f cmVwb3J0X2V2ZW50KGJkYXRhKTsKPiAgCX0KPiAgCj4gLQlpZiAoIWRldmljZV9tYXlfd2FrZXVw KGRldikgJiYgZGRhdGEtPmVuYWJsZV9hZnRlcl9zdXNwZW5kKQo+IC0JCWdwaW9fa2V5c19vcGVu KGRkYXRhLT5pbnB1dCk7Cj4gKwlpZiAoIWRldmljZV9tYXlfd2FrZXVwKGRldikgJiYgZGRhdGEt PmVuYWJsZV9hZnRlcl9zdXNwZW5kCj4gKwkgICAgJiYgZGRhdGEtPmVuYWJsZSkKPiArCQlkZGF0 YS0+ZW5hYmxlKGRldik7Cj4gIAo+ICAJaW5wdXRfc3luYyhkZGF0YS0+aW5wdXQpOwo+ICAKPiAt LSAKPiAxLjcuOS41Cj4gCgotLSAKTGVlIEpvbmVzCkxpbmFybyBTVC1Fcmljc3NvbiBMYW5kaW5n IFRlYW0gTGVhZApMaW5hcm8ub3JnIOKUgiBPcGVuIHNvdXJjZSBzb2Z0d2FyZSBmb3IgQVJNIFNv Q3MKRm9sbG93IExpbmFybzogRmFjZWJvb2sgfCBUd2l0dGVyIHwgQmxvZwoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWls aW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0 cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: lee.jones@linaro.org (Lee Jones) Date: Thu, 22 Nov 2012 14:51:53 +0000 Subject: [PATCH 2/2] input: gpio-keys: Add runtime support In-Reply-To: <1353590617-11466-2-git-send-email-lee.jones@linaro.org> References: <1353590617-11466-1-git-send-email-lee.jones@linaro.org> <1353590617-11466-2-git-send-email-lee.jones@linaro.org> Message-ID: <20121122145153.GB10986@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Ignore this. I've just rebased and the API has changed slightly. Will fixup and resend. > From: Jonas Aaberg > > Cc: Dmitry Torokhov > Cc: linux-input at vger.kernel.org > Signed-off-by: Lee Jones > Signed-off-by: Jonas Aaberg > Signed-off-by: Philippe Langlais > Reviewed-by: Bengt Jonsson > --- > drivers/input/keyboard/gpio_keys.c | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) > > diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c > index 2cf6757..cff548c 100644 > --- a/drivers/input/keyboard/gpio_keys.c > +++ b/drivers/input/keyboard/gpio_keys.c > @@ -29,6 +29,7 @@ > #include > #include > #include > +#include > > struct gpio_button_data { > const struct gpio_keys_button *button; > @@ -533,6 +534,7 @@ static int gpio_keys_open(struct input_dev *input) > struct gpio_keys_drvdata *ddata = input_get_drvdata(input); > const struct gpio_keys_platform_data *pdata = ddata->pdata; > > + pm_runtime_get_sync(input->dev.parent); > ddata->enabled = true; > > return pdata->enable ? pdata->enable(input->dev.parent) : 0; > @@ -547,6 +549,8 @@ static void gpio_keys_close(struct input_dev *input) > > if (pdata->disable) > pdata->disable(input->dev.parent); > + > + pm_runtime_put(input->dev.parent); > } > > /* > @@ -708,6 +712,8 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) > input->id.product = 0x0001; > input->id.version = 0x0100; > > + pm_runtime_enable(&pdev->dev); > + > /* Enable auto repeat feature of Linux input subsystem */ > if (pdata->rep) > __set_bit(EV_REP, input->evbit); > @@ -773,6 +779,8 @@ static int __devexit gpio_keys_remove(struct platform_device *pdev) > struct input_dev *input = ddata->input; > int i; > > + pm_runtime_disable(&pdev->dev); > + > sysfs_remove_group(&pdev->dev.kobj, &gpio_keys_attr_group); > > device_init_wakeup(&pdev->dev, 0); > @@ -805,8 +813,8 @@ static int gpio_keys_suspend(struct device *dev) > } > } else { > ddata->enable_after_suspend = ddata->enabled; > - if (ddata->enabled) > - gpio_keys_close(ddata->input); > + if (ddata->enabled && ddata->disable) > + ddata->disable(dev); > } > > return 0; > @@ -826,8 +834,9 @@ static int gpio_keys_resume(struct device *dev) > gpio_keys_gpio_report_event(bdata); > } > > - if (!device_may_wakeup(dev) && ddata->enable_after_suspend) > - gpio_keys_open(ddata->input); > + if (!device_may_wakeup(dev) && ddata->enable_after_suspend > + && ddata->enable) > + ddata->enable(dev); > > input_sync(ddata->input); > > -- > 1.7.9.5 > -- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932267Ab2KVS4P (ORCPT ); Thu, 22 Nov 2012 13:56:15 -0500 Received: from mail-bk0-f46.google.com ([209.85.214.46]:53437 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754234Ab2KVS4K (ORCPT ); Thu, 22 Nov 2012 13:56:10 -0500 Date: Thu, 22 Nov 2012 14:51:53 +0000 From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, Jonas Aaberg , Dmitry Torokhov , linux-input@vger.kernel.org, Philippe Langlais Subject: Re: [PATCH 2/2] input: gpio-keys: Add runtime support Message-ID: <20121122145153.GB10986@gmail.com> References: <1353590617-11466-1-git-send-email-lee.jones@linaro.org> <1353590617-11466-2-git-send-email-lee.jones@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1353590617-11466-2-git-send-email-lee.jones@linaro.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ignore this. I've just rebased and the API has changed slightly. Will fixup and resend. > From: Jonas Aaberg > > Cc: Dmitry Torokhov > Cc: linux-input@vger.kernel.org > Signed-off-by: Lee Jones > Signed-off-by: Jonas Aaberg > Signed-off-by: Philippe Langlais > Reviewed-by: Bengt Jonsson > --- > drivers/input/keyboard/gpio_keys.c | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) > > diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c > index 2cf6757..cff548c 100644 > --- a/drivers/input/keyboard/gpio_keys.c > +++ b/drivers/input/keyboard/gpio_keys.c > @@ -29,6 +29,7 @@ > #include > #include > #include > +#include > > struct gpio_button_data { > const struct gpio_keys_button *button; > @@ -533,6 +534,7 @@ static int gpio_keys_open(struct input_dev *input) > struct gpio_keys_drvdata *ddata = input_get_drvdata(input); > const struct gpio_keys_platform_data *pdata = ddata->pdata; > > + pm_runtime_get_sync(input->dev.parent); > ddata->enabled = true; > > return pdata->enable ? pdata->enable(input->dev.parent) : 0; > @@ -547,6 +549,8 @@ static void gpio_keys_close(struct input_dev *input) > > if (pdata->disable) > pdata->disable(input->dev.parent); > + > + pm_runtime_put(input->dev.parent); > } > > /* > @@ -708,6 +712,8 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) > input->id.product = 0x0001; > input->id.version = 0x0100; > > + pm_runtime_enable(&pdev->dev); > + > /* Enable auto repeat feature of Linux input subsystem */ > if (pdata->rep) > __set_bit(EV_REP, input->evbit); > @@ -773,6 +779,8 @@ static int __devexit gpio_keys_remove(struct platform_device *pdev) > struct input_dev *input = ddata->input; > int i; > > + pm_runtime_disable(&pdev->dev); > + > sysfs_remove_group(&pdev->dev.kobj, &gpio_keys_attr_group); > > device_init_wakeup(&pdev->dev, 0); > @@ -805,8 +813,8 @@ static int gpio_keys_suspend(struct device *dev) > } > } else { > ddata->enable_after_suspend = ddata->enabled; > - if (ddata->enabled) > - gpio_keys_close(ddata->input); > + if (ddata->enabled && ddata->disable) > + ddata->disable(dev); > } > > return 0; > @@ -826,8 +834,9 @@ static int gpio_keys_resume(struct device *dev) > gpio_keys_gpio_report_event(bdata); > } > > - if (!device_may_wakeup(dev) && ddata->enable_after_suspend) > - gpio_keys_open(ddata->input); > + if (!device_may_wakeup(dev) && ddata->enable_after_suspend > + && ddata->enable) > + ddata->enable(dev); > > input_sync(ddata->input); > > -- > 1.7.9.5 > -- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog