| Message ID | 1465944212-17079-2-git-send-email-john.stultz@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Tue, Jun 14, 2016 at 3:43 PM, John Stultz <john.stultz@linaro.org> wrote: > From: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org> > > This driver provides a input driver for the power button on the > HiSi 65xx SoC for boards like HiKey. > > This driver was originally by Zhiliang Xue <xuezhiliang@huawei.com> > then basically rewritten by Jorge, but preserving the original > module author credits. > > Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Lee Jones <lee.jones@linaro.org> > Cc: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org> > Cc: Feng Chen <puck.chen@hisilicon.com> > Cc: Wei Xu <xuwei5@hisilicon.com> > Cc: Guodong Xu <guodong.xu@linaro.org> > Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org> > [jstultz: Reworked commit message, folded in other fixes/cleanups > from Jorge, implemented some larger cleanups suggested by DmitryT] > Signed-off-by: John Stultz <john.stultz@linaro.org> > --- > v2: Major rework integrating feedback from Dmitry. > v3: Dropped of_match compatible line since no longer using DT > for this. > v4: Removed MODULE_DEVICE_TABLE(of, hi65xx_powerkey_of_match) line > I missed in the last revision, which casued build issues w/ > modules. Hey Dmitry, Just wanted to ping you to see if there was anything else you were wanting changed with this patch. Lee has queued the mfd patches in -next, so I wanted to be sure to address any concerns you had that was keeping this from heading upstream in 4.8 (hopefully :). thanks -john
On Wed, Jun 22, 2016 at 5:47 PM, Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote: > On Tue, Jun 21, 2016 at 05:06:23PM -0700, John Stultz wrote: >> On Tue, Jun 14, 2016 at 3:43 PM, John Stultz <john.stultz@linaro.org> wrote: >> > From: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org> >> > >> > This driver provides a input driver for the power button on the >> > HiSi 65xx SoC for boards like HiKey. >> > >> > This driver was originally by Zhiliang Xue <xuezhiliang@huawei.com> >> > then basically rewritten by Jorge, but preserving the original >> > module author credits. >> > >> > Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> >> > Cc: Rob Herring <robh+dt@kernel.org> >> > Cc: Lee Jones <lee.jones@linaro.org> >> > Cc: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org> >> > Cc: Feng Chen <puck.chen@hisilicon.com> >> > Cc: Wei Xu <xuwei5@hisilicon.com> >> > Cc: Guodong Xu <guodong.xu@linaro.org> >> > Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org> >> > [jstultz: Reworked commit message, folded in other fixes/cleanups >> > from Jorge, implemented some larger cleanups suggested by DmitryT] >> > Signed-off-by: John Stultz <john.stultz@linaro.org> >> > --- >> > v2: Major rework integrating feedback from Dmitry. >> > v3: Dropped of_match compatible line since no longer using DT >> > for this. >> > v4: Removed MODULE_DEVICE_TABLE(of, hi65xx_powerkey_of_match) line >> > I missed in the last revision, which casued build issues w/ >> > modules. >> >> Hey Dmitry, >> Just wanted to ping you to see if there was anything else you were >> wanting changed with this patch. Lee has queued the mfd patches in >> -next, so I wanted to be sure to address any concerns you had that was >> keeping this from heading upstream in 4.8 (hopefully :). > > Right, sorry, does the following look OK to you? > Yes! It looks great (and I tested it works too)! Do you want to fold that in, or do you need me to re-submit with those changes? thanks -john
On Thu, Jun 23, 2016 at 1:47 PM, Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote: > On Thu, Jun 23, 2016 at 01:40:22PM -0700, Dmitry Torokhov wrote: >> On Thu, Jun 23, 2016 at 01:31:28PM -0700, John Stultz wrote: >> > On Wed, Jun 22, 2016 at 5:47 PM, Dmitry Torokhov >> > <dmitry.torokhov@gmail.com> wrote: >> > > >> > > Right, sorry, does the following look OK to you? >> > > >> > >> > Yes! It looks great (and I tested it works too)! >> > >> > Do you want to fold that in, or do you need me to re-submit with those changes? >> >> I'll fold it in on my side. Thank you for testing it! > > Changed the config symbol to INPUT_HISI_POWERKEY to match other symbols > in drivers/input/misc and queued for the next merge window. Thanks, I really appreciate it, and apologies for missing so many things you had to fix up! -john
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index 1f2337a..07aacfc 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig @@ -796,4 +796,13 @@ config INPUT_DRV2667_HAPTICS To compile this driver as a module, choose M here: the module will be called drv2667-haptics. +config HISI_POWERKEY + tristate "Hisilicon PMIC ONKEY support" + depends on ARCH_HISI || COMPILE_TEST + help + Say Y to enable support for PMIC ONKEY. + + To compile this driver as a module, choose M here: the + module will be called hisi_powerkey. + endif diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile index 0357a08..f264777 100644 --- a/drivers/input/misc/Makefile +++ b/drivers/input/misc/Makefile @@ -75,3 +75,4 @@ obj-$(CONFIG_INPUT_WM831X_ON) += wm831x-on.o obj-$(CONFIG_INPUT_XEN_KBDDEV_FRONTEND) += xen-kbdfront.o obj-$(CONFIG_INPUT_YEALINK) += yealink.o obj-$(CONFIG_INPUT_IDEAPAD_SLIDEBAR) += ideapad_slidebar.o +obj-$(CONFIG_HISI_POWERKEY) += hisi_powerkey.o diff --git a/drivers/input/misc/hisi_powerkey.c b/drivers/input/misc/hisi_powerkey.c new file mode 100644 index 0000000..e5ab5d8 --- /dev/null +++ b/drivers/input/misc/hisi_powerkey.c @@ -0,0 +1,147 @@ +/* + * Hisilicon PMIC powerkey driver + * + * Copyright (C) 2013 Hisilicon Ltd. + * Copyright (C) 2015, 2016 Linaro Ltd. + * + * 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/platform_device.h> +#include <linux/interrupt.h> +#include <linux/reboot.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of_irq.h> +#include <linux/input.h> +#include <linux/slab.h> + +/* the held interrupt will trigger after 4 seconds */ +#define MAX_HELD_TIME (4 * MSEC_PER_SEC) + + +enum id_action { ID_PRESSED, ID_RELEASED, ID_HELD, ID_LAST }; +const char *const irq_names[ID_LAST] = {"down", "up", "hold 4s"}; + +struct hi65xx_priv { + struct input_dev *input; +}; + +static irqreturn_t hi65xx_power_press_isr(int irq, void *q) +{ + struct hi65xx_priv *p = q; + + pm_wakeup_event(p->input->dev.parent, MAX_HELD_TIME); + input_report_key(p->input, KEY_POWER, 1); + input_sync(p->input); + + return IRQ_HANDLED; +} + +static irqreturn_t hi65xx_power_release_isr(int irq, void *q) +{ + struct hi65xx_priv *p = q; + + pm_wakeup_event(p->input->dev.parent, MAX_HELD_TIME); + input_report_key(p->input, KEY_POWER, 0); + input_sync(p->input); + + return IRQ_HANDLED; +} + +static irqreturn_t hi65xx_restart_toggle_isr(int irq, void *q) +{ + struct hi65xx_priv *p = q; + int value = test_bit(KEY_RESTART, p->input->key); + + pm_wakeup_event(p->input->dev.parent, MAX_HELD_TIME); + input_report_key(p->input, KEY_RESTART, !value); + input_sync(p->input); + + return IRQ_HANDLED; +} + +irqreturn_t (*irq_handlers[ID_LAST])(int irq, void *q) = { + hi65xx_power_press_isr, + hi65xx_power_release_isr, + hi65xx_restart_toggle_isr, +}; + +static int hi65xx_powerkey_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct hi65xx_priv *priv; + int irq, i, ret; + + priv = devm_kzalloc(dev, sizeof(struct hi65xx_priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + priv->input = devm_input_allocate_device(&pdev->dev); + if (!priv->input) { + dev_err(&pdev->dev, "failed to allocate input device\n"); + return -ENOMEM; + } + + priv->input->phys = "hisi_on/input0"; + priv->input->name = "HISI 65xx PowerOn Key"; + + input_set_capability(priv->input, EV_KEY, KEY_POWER); + input_set_capability(priv->input, EV_KEY, KEY_RESTART); + + for (i = 0; i < ID_LAST; i++) { + + irq = platform_get_irq_byname(pdev, irq_names[i]); + if (irq < 0) { + dev_err(dev, "couldn't get irq %s\n", irq_names[i]); + return irq; + } + + ret = devm_request_any_context_irq(dev, irq, + irq_handlers[i], IRQF_ONESHOT, + irq_names[i], priv); + if (ret < 0) { + dev_err(dev, "couldn't get irq %s\n", irq_names[i]); + return ret; + } + } + + ret = input_register_device(priv->input); + if (ret) { + dev_err(&pdev->dev, "failed to register input device: %d\n", + ret); + return ret; + } + + platform_set_drvdata(pdev, priv); + device_init_wakeup(&pdev->dev, 1); + + return 0; +} + +static int hi65xx_powerkey_remove(struct platform_device *pdev) +{ + device_init_wakeup(&pdev->dev, 0); + return 0; +} + +static struct platform_driver hi65xx_powerkey_driver = { + .driver = { + .name = "hi65xx-powerkey", + }, + .probe = hi65xx_powerkey_probe, + .remove = hi65xx_powerkey_remove, +}; + +module_platform_driver(hi65xx_powerkey_driver); + +MODULE_AUTHOR("Zhiliang Xue <xuezhiliang@huawei.com"); +MODULE_DESCRIPTION("Hisi PMIC Power key driver"); +MODULE_LICENSE("GPL v2");