From: Dmitry Torokhov <dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: Carlo Caione <carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org,
hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org,
emilio-0Z03zUJReD5OxF6Tv1QG9Q@public.gmane.org,
wens-jdAy2FN1RRM@public.gmane.org,
sameo-VuQAYsv1563Yd54FQh9/CA@public.gmane.org,
linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org,
boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org
Subject: Re: [PATCH v4 4/9] input: misc: Add driver for AXP20x Power Enable Key
Date: Sun, 13 Apr 2014 01:17:01 -0700 [thread overview]
Message-ID: <20140413081701.GB7267@core.coreip.homeip.net> (raw)
In-Reply-To: <1397209093-10077-5-git-send-email-carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>
On Fri, Apr 11, 2014 at 11:38:08AM +0200, Carlo Caione wrote:
> This patch add support for the Power Enable Key found on MFD AXP202 and
> AXP209. Besides the basic support for the button, the driver adds two
> entries in sysfs to configure the time delay for power on/off.
>
> Signed-off-by: Carlo Caione <carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>
> ---
> drivers/input/misc/Kconfig | 11 ++
> drivers/input/misc/Makefile | 1 +
> drivers/input/misc/axp20x-pek.c | 261 ++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 273 insertions(+)
> create mode 100644 drivers/input/misc/axp20x-pek.c
>
> diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
> index 7904ab0..87244fb 100644
> --- a/drivers/input/misc/Kconfig
> +++ b/drivers/input/misc/Kconfig
> @@ -393,6 +393,17 @@ config INPUT_RETU_PWRBUTTON
> To compile this driver as a module, choose M here. The module will
> be called retu-pwrbutton.
>
> +config INPUT_AXP20X_PEK
> + tristate "X-Powers AXP20X power button driver"
> + depends on MFD_AXP20X
> + help
> + Say Y here if you want to enable power key reporting via the
> + AXP20X PMIC.
> +
> + To compile this driver as a module, choose M here. The module will
> + be called axp20x-pek.
> +
> +
> config INPUT_TWL4030_PWRBUTTON
> tristate "TWL4030 Power button Driver"
> depends on TWL4030_CORE
> diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
> index cda71fc..624abf5 100644
> --- a/drivers/input/misc/Makefile
> +++ b/drivers/input/misc/Makefile
> @@ -50,6 +50,7 @@ obj-$(CONFIG_INPUT_POWERMATE) += powermate.o
> obj-$(CONFIG_INPUT_PWM_BEEPER) += pwm-beeper.o
> obj-$(CONFIG_INPUT_RB532_BUTTON) += rb532_button.o
> obj-$(CONFIG_INPUT_RETU_PWRBUTTON) += retu-pwrbutton.o
> +obj-$(CONFIG_INPUT_AXP20X_PEK) += axp20x-pek.o
> obj-$(CONFIG_INPUT_GPIO_ROTARY_ENCODER) += rotary_encoder.o
> obj-$(CONFIG_INPUT_SGI_BTNS) += sgi_btns.o
> obj-$(CONFIG_INPUT_SIRFSOC_ONKEY) += sirfsoc-onkey.o
> diff --git a/drivers/input/misc/axp20x-pek.c b/drivers/input/misc/axp20x-pek.c
> new file mode 100644
> index 0000000..a9112bd
> --- /dev/null
> +++ b/drivers/input/misc/axp20x-pek.c
> @@ -0,0 +1,261 @@
> +/*
> + * axp20x power button driver.
> + *
> + * Copyright (C) 2013 Carlo Caione <carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>
> + *
> + * This file is subject to the terms and conditions of the GNU General
> + * Public License. See the file "COPYING" in the main directory of this
> + * archive for more details.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + */
> +
> +#include <linux/errno.h>
> +#include <linux/irq.h>
> +#include <linux/init.h>
> +#include <linux/input.h>
> +#include <linux/interrupt.h>
> +#include <linux/kernel.h>
> +#include <linux/mfd/axp20x.h>
> +#include <linux/module.h>
> +#include <linux/platform_device.h>
> +#include <linux/regmap.h>
> +#include <linux/slab.h>
> +
> +#define AXP20X_PEK_STARTUP_MASK (0xc0)
> +#define AXP20X_PEK_SHUTDOWN_MASK (0x03)
> +
> +struct axp20x_pek {
> + struct axp20x_dev *axp20x;
> + struct input_dev *input;
> + int irq_dbr;
> + int irq_dbf;
> +};
> +
> +struct axp20x_time {
> + unsigned int time;
> + unsigned int idx;
> +};
> +
> +static const struct axp20x_time startup_time[] = {
> + { .time = 128, .idx = 0 },
> + { .time = 1000, .idx = 2 },
> + { .time = 3000, .idx = 1 },
> + { .time = 2000, .idx = 3 },
> +};
> +
> +static const struct axp20x_time shutdown_time[] = {
> + { .time = 4000, .idx = 0 },
> + { .time = 6000, .idx = 1 },
> + { .time = 8000, .idx = 2 },
> + { .time = 10000, .idx = 3 },
> +};
> +
> +struct axp20x_pek_ext_attr {
> + const struct axp20x_time *p_time;
> + unsigned int mask;
> +};
> +
> +static struct axp20x_pek_ext_attr axp20x_pek_startup_ext_attr = {
> + .p_time = startup_time,
> + .mask = AXP20X_PEK_STARTUP_MASK,
> +};
> +
> +static struct axp20x_pek_ext_attr axp20x_pek_shutdown_ext_attr = {
> + .p_time = shutdown_time,
> + .mask = AXP20X_PEK_SHUTDOWN_MASK,
> +};
> +
> +static struct axp20x_pek_ext_attr *get_axp_ext_attr(struct device_attribute *attr)
> +{
> + return container_of(attr, struct dev_ext_attribute, attr)->var;
> +}
> +
> +static ssize_t axp20x_show_ext_attr(struct device *dev, struct device_attribute *attr,
> + char *buf)
> +{
> + struct axp20x_pek *axp20x_pek = dev_get_drvdata(dev);
> + struct axp20x_pek_ext_attr *axp20x_ea = get_axp_ext_attr(attr);
> + unsigned int val;
> + int ret, i;
> +
> + ret = regmap_read(axp20x_pek->axp20x->regmap, AXP20X_PEK_KEY, &val);
> + if (ret != 0)
> + return ret;
> +
> + val &= axp20x_ea->mask;
> + val >>= ffs(axp20x_ea->mask) - 1;
> +
> + for (i = 0; i < 4; i++)
> + if (val == axp20x_ea->p_time[i].idx)
> + val = axp20x_ea->p_time[i].time;
> +
> + return sprintf(buf, "%ums\n", val);
Please do not print ums and instead document the units in sysfs ABI
docs.
> +}
> +
> +static ssize_t axp20x_store_ext_attr(struct device *dev, struct device_attribute *attr,
> + const char *buf, size_t count)
> +{
> + struct axp20x_pek *axp20x_pek = dev_get_drvdata(dev);
> + struct axp20x_pek_ext_attr *axp20x_ea = get_axp_ext_attr(attr);
> + char val_str[20];
> + size_t len;
> + int ret, i;
> + unsigned int val, idx = 0;
> + unsigned int best_err = UINT_MAX;
> +
> + val_str[sizeof(val_str) - 1] = '\0';
> + strncpy(val_str, buf, sizeof(val_str) - 1);
> + len = strlen(val_str);
> +
> + if (len && val_str[len - 1] == '\n')
> + val_str[len - 1] = '\0';
> +
> + ret = kstrtouint(val_str, 10, &val);
> + if (ret)
> + return ret;
> +
> + for (i = 3; i >= 0; i--) {
> + unsigned int err;
> +
> + err = abs(axp20x_ea->p_time[i].time - val);
> + if (err < best_err) {
> + best_err = err;
> + idx = axp20x_ea->p_time[i].idx;
> + }
> +
> + if (!err)
> + break;
> + }
> +
> + idx <<= ffs(axp20x_ea->mask) - 1;
> + ret = regmap_update_bits(axp20x_pek->axp20x->regmap,
> + AXP20X_PEK_KEY,
> + axp20x_ea->mask, idx);
> + if (ret != 0)
> + return -EINVAL;
> + return count;
> +}
> +
> +static struct dev_ext_attribute axp20x_dev_attr_startup = {
> + .attr = __ATTR(startup, 0644, axp20x_show_ext_attr, axp20x_store_ext_attr),
> + .var = &axp20x_pek_startup_ext_attr
> +};
> +
> +static struct dev_ext_attribute axp20x_dev_attr_shutdown = {
> + .attr = __ATTR(shutdown, 0644, axp20x_show_ext_attr, axp20x_store_ext_attr),
> + .var = &axp20x_pek_shutdown_ext_attr
> +};
> +
> +static irqreturn_t axp20x_pek_irq(int irq, void *pwr)
> +{
> + struct input_dev *idev = pwr;
> + struct axp20x_pek *axp20x_pek = input_get_drvdata(idev);
> +
> + if (irq == axp20x_pek->irq_dbr)
> + input_report_key(idev, KEY_POWER, true);
> + else if (irq == axp20x_pek->irq_dbf)
> + input_report_key(idev, KEY_POWER, false);
> +
> + input_sync(idev);
> +
> + return IRQ_HANDLED;
> +}
> +
> +static int axp20x_pek_probe(struct platform_device *pdev)
> +{
> + struct axp20x_pek *axp20x_pek;
> + struct axp20x_dev *axp20x;
> + struct input_dev *idev;
> + int error;
> +
> + axp20x_pek = devm_kzalloc(&pdev->dev, sizeof(struct axp20x_pek),
> + GFP_KERNEL);
> + if (!axp20x_pek)
> + return -ENOMEM;
> +
> + axp20x_pek->axp20x = dev_get_drvdata(pdev->dev.parent);
> + axp20x = axp20x_pek->axp20x;
> +
> + axp20x_pek->irq_dbr = platform_get_irq_byname(pdev, "PEK_DBR");
> + if (axp20x_pek->irq_dbr < 0) {
> + dev_err(&pdev->dev, "No IRQ for PEK_DBR, error=%d\n",
> + axp20x_pek->irq_dbr);
> + return axp20x_pek->irq_dbr;
> + }
> + axp20x_pek->irq_dbr = regmap_irq_get_virq(axp20x->regmap_irqc,
> + axp20x_pek->irq_dbr);
> +
> + axp20x_pek->irq_dbf = platform_get_irq_byname(pdev, "PEK_DBF");
> + if (axp20x_pek->irq_dbf < 0) {
> + dev_err(&pdev->dev, "No IRQ for PEK_DBF, error=%d\n",
> + axp20x_pek->irq_dbf);
> + return axp20x_pek->irq_dbf;
> + }
> + axp20x_pek->irq_dbf = regmap_irq_get_virq(axp20x->regmap_irqc,
> + axp20x_pek->irq_dbf);
> +
> + axp20x_pek->input = devm_input_allocate_device(&pdev->dev);
> + if (!axp20x_pek->input)
> + return -ENOMEM;
> +
> + idev = axp20x_pek->input;
> +
> + idev->name = "axp20x-pek";
> + idev->phys = "m1kbd/input2";
> + idev->dev.parent = &pdev->dev;
> +
> + input_set_capability(idev, EV_KEY, KEY_POWER);
> +
> + input_set_drvdata(idev, axp20x_pek);
> +
> + error = devm_request_any_context_irq(&pdev->dev, axp20x_pek->irq_dbr,
> + axp20x_pek_irq, 0,
> + "axp20x-pek-dbr", idev);
> + if (error < 0) {
> + dev_err(axp20x->dev, "Failed to request dbr IRQ#%d: %d\n",
> + axp20x_pek->irq_dbr, error);
> +
> + return error;
> + }
> +
> + error = devm_request_any_context_irq(&pdev->dev, axp20x_pek->irq_dbf,
> + axp20x_pek_irq, 0,
> + "axp20x-pek-dbf", idev);
> + if (error < 0) {
> + dev_err(axp20x->dev, "Failed to request dbf IRQ#%d: %d\n",
> + axp20x_pek->irq_dbf, error);
> + return error;
> + }
> +
> +
> + if (device_create_file(&pdev->dev, &axp20x_dev_attr_startup.attr) ||
> + device_create_file(&pdev->dev, &axp20x_dev_attr_shutdown.attr))
> + return -ENODEV;
I think you still want to use attribute group here. You also need to
clean up the attributes when unbinding device. Also, why returning
-ENODEV instead of the proper error code?
> +
> + error = input_register_device(idev);
> + if (error) {
> + dev_err(axp20x->dev, "Can't register input device: %d\n", error);
> + return error;
> + }
> +
> + platform_set_drvdata(pdev, axp20x_pek);
> +
> + return 0;
> +}
> +
> +static struct platform_driver axp20x_pek_driver = {
> + .probe = axp20x_pek_probe,
> + .driver = {
> + .name = "axp20x-pek",
> + .owner = THIS_MODULE,
> + },
> +};
> +module_platform_driver(axp20x_pek_driver);
> +
> +MODULE_DESCRIPTION("axp20x Power Button");
> +MODULE_AUTHOR("Carlo Caione <carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>");
> +MODULE_LICENSE("GPL");
> --
> 1.8.3.2
>
Thanks.
--
Dmitry
next prev parent reply other threads:[~2014-04-13 8:17 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-11 9:38 [PATCH v4 0/9] mfd: AXP20x: Add support for AXP202 and AXP209 Carlo Caione
[not found] ` <1397209093-10077-1-git-send-email-carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>
2014-04-11 9:38 ` [PATCH v4 1/9] mfd: AXP20x: Add mfd driver for AXP20x PMIC Carlo Caione
[not found] ` <1397209093-10077-2-git-send-email-carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>
2014-04-11 11:25 ` Arnd Bergmann
2014-04-11 12:03 ` [linux-sunxi] " Carlo Caione
2014-04-11 12:09 ` Mark Brown
[not found] ` <20140411120908.GC28800-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2014-04-11 13:16 ` Arnd Bergmann
2014-04-16 15:43 ` Lee Jones
2014-04-16 15:44 ` Lee Jones
2014-04-11 9:38 ` [PATCH v4 2/9] dt-bindings: add vendor-prefix for X-Powers Carlo Caione
2014-04-11 9:38 ` [PATCH v4 3/9] mfd: AXP20x: Add bindings documentation Carlo Caione
2014-04-11 9:38 ` [PATCH v4 4/9] input: misc: Add driver for AXP20x Power Enable Key Carlo Caione
[not found] ` <1397209093-10077-5-git-send-email-carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>
2014-04-13 8:17 ` Dmitry Torokhov [this message]
2014-04-17 12:07 ` [linux-sunxi] " Carlo Caione
2014-04-11 9:38 ` [PATCH v4 5/9] input: misc: Add ABI docs for AXP20x PEK Carlo Caione
2014-04-11 9:38 ` [PATCH v4 6/9] regulator: AXP20x: Add support for regulators subsystem Carlo Caione
[not found] ` <1397209093-10077-7-git-send-email-carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>
2014-04-11 12:23 ` Mark Brown
2014-04-11 12:29 ` [linux-sunxi] " Carlo Caione
2014-05-15 18:03 ` Boris BREZILLON
[not found] ` <5375015A.10701-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2014-05-15 18:18 ` Mark Brown
2014-05-16 7:40 ` Carlo Caione
2014-04-11 9:38 ` [PATCH v4 7/9] ARM: sun7i/sun4i: dt: Add AXP209 support to various boards Carlo Caione
[not found] ` <1397209093-10077-8-git-send-email-carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>
2014-04-11 12:29 ` Mark Brown
2014-04-11 13:04 ` Carlo Caione
[not found] ` <CAOQ7t2Y2B7f+eZApDHKiKm9=bOXo6oUA2RLY7ENn7qPLQEboMA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-04-11 16:18 ` Mark Brown
[not found] ` <20140411161813.GF28800-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2014-04-17 10:06 ` Carlo Caione
[not found] ` <CAOQ7t2YO_MjUZkkoEe1Grft+fVttWoOro85Sru2P3LXbx8Kjbg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-04-18 15:15 ` Mark Brown
[not found] ` <20140418151551.GZ12304-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2014-04-23 20:25 ` Carlo Caione
[not found] ` <20140423202546.GA3890-OP/Sd6KM9CusbfqNwF1Yyl6hYfS7NtTn@public.gmane.org>
2014-04-24 13:30 ` Mark Brown
2014-04-24 16:35 ` Charles Keepax
[not found] ` <20140424163523.GB25663-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
2014-04-24 16:58 ` Charles Keepax
[not found] ` <20140424165847.GC25663-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
2014-04-24 17:12 ` Mark Brown
2014-04-14 9:52 ` Maxime Ripard
2014-04-14 10:02 ` Carlo Caione
[not found] ` <CAOQ7t2ZybF=dm-NBQ3niN7gb-Asgwz5CW-VSkOzWR6t2NCaA8w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-04-14 10:20 ` Hans de Goede
[not found] ` <534BB670.8030102-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2014-04-14 11:16 ` Mark Brown
2014-04-11 9:38 ` [PATCH v4 8/9] ARM: sunxi: Add AXP20x support in defconfig Carlo Caione
2014-04-11 9:38 ` [PATCH v4 9/9] ARM: sunxi: Add AXP20x support multi_v7_defconfig Carlo Caione
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140413081701.GB7267@core.coreip.homeip.net \
--to=dmitry.torokhov-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
--cc=boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \
--cc=broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org \
--cc=emilio-0Z03zUJReD5OxF6Tv1QG9Q@public.gmane.org \
--cc=hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org \
--cc=maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \
--cc=sameo-VuQAYsv1563Yd54FQh9/CA@public.gmane.org \
--cc=wens-jdAy2FN1RRM@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).