Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1422429 > unrolled thread

[PATCH 0/4] Hi655x powerkey support for HiKey (v4)

Back to article view | Back to linux.kernel

Contents

  [PATCH 0/4] Hi655x powerkey support for HiKey (v4) John Stultz <john.stultz@linaro.org> - 2016-06-15 00:50 +0200
    [PATCH 1/4] drivers: input: powerkey for HISI 65xx SoC John Stultz <john.stultz@linaro.org> - 2016-06-15 00:50 +0200
      Re: [PATCH 1/4] drivers: input: powerkey for HISI 65xx SoC John Stultz <john.stultz@linaro.org> - 2016-06-22 02:10 +0200
        Re: [PATCH 1/4] drivers: input: powerkey for HISI 65xx SoC Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2016-06-23 02:50 +0200

#1422429 — [PATCH 0/4] Hi655x powerkey support for HiKey (v4)

This patchset enables the pmic powerkey to function on HiKey,
that I'd like to submit for consideration to be merged.

New in v4:
* Integrated a few cleanup suggestions from Lee Jones.
* Removed MODULE_DEVICE_TABLE(of, hi65xx_powerkey_of_match);
  line I missed when removing the dts initialization logic.

Review and feedback are always appreciated!

thanks
-john


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>


John Stultz (3):
  mfd: hi655x-pmic: Fixup issue with un-acked interrupts
  mfd: hi655x-pmic: Rename some interrupt macro names
  mfd: hi655x-pmic: Add powerkey device to hi655x PMIC driver

Jorge Ramirez-Ortiz (1):
  drivers: input: powerkey for HISI 65xx SoC

 drivers/input/misc/Kconfig         |   9 +++
 drivers/input/misc/Makefile        |   1 +
 drivers/input/misc/hisi_powerkey.c | 147 +++++++++++++++++++++++++++++++++++++
 drivers/mfd/hi655x-pmic.c          |  52 +++++++++----
 include/linux/mfd/hi655x-pmic.h    |  25 +++++--
 5 files changed, 213 insertions(+), 21 deletions(-)
 create mode 100644 drivers/input/misc/hisi_powerkey.c

-- 
1.9.1

[toc] | [next] | [standalone]

#1422430 — [PATCH 1/4] drivers: input: powerkey for HISI 65xx SoC

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.
 
 drivers/input/misc/Kconfig         |   9 +++
 drivers/input/misc/Makefile        |   1 +
 drivers/input/misc/hisi_powerkey.c | 147 +++++++++++++++++++++++++++++++++++++
 3 files changed, 157 insertions(+)
 create mode 100644 drivers/input/misc/hisi_powerkey.c

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");
-- 
1.9.1

[toc] | [prev] | [next] | [standalone]

#1428271 — Re: [PATCH 1/4] drivers: input: powerkey for HISI 65xx SoC

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

[toc] | [prev] | [next] | [standalone]

#1429370 — Re: [PATCH 1/4] drivers: input: powerkey for HISI 65xx SoC

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? 

Thanks.

-- 
Dmitry


Input: hisi_powerkey - misc changes

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 drivers/input/misc/hisi_powerkey.c |  101 +++++++++++++++++-------------------
 1 file changed, 48 insertions(+), 53 deletions(-)

diff --git a/drivers/input/misc/hisi_powerkey.c b/drivers/input/misc/hisi_powerkey.c
index e5ab5d8..675539c 100644
--- a/drivers/input/misc/hisi_powerkey.c
+++ b/drivers/input/misc/hisi_powerkey.c
@@ -26,101 +26,96 @@
 /* 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;
+	struct input_dev *input = q;
 
-	pm_wakeup_event(p->input->dev.parent, MAX_HELD_TIME);
-	input_report_key(p->input, KEY_POWER, 1);
-	input_sync(p->input);
+	pm_wakeup_event(input->dev.parent, MAX_HELD_TIME);
+	input_report_key(input, KEY_POWER, 1);
+	input_sync(input);
 
 	return IRQ_HANDLED;
 }
 
 static irqreturn_t hi65xx_power_release_isr(int irq, void *q)
 {
-	struct hi65xx_priv *p = q;
+	struct input_dev *input = q;
 
-	pm_wakeup_event(p->input->dev.parent, MAX_HELD_TIME);
-	input_report_key(p->input, KEY_POWER, 0);
-	input_sync(p->input);
+	pm_wakeup_event(input->dev.parent, MAX_HELD_TIME);
+	input_report_key(input, KEY_POWER, 0);
+	input_sync(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);
+	struct input_dev *input = q;
+	int value = test_bit(KEY_RESTART, input->key);
 
-	pm_wakeup_event(p->input->dev.parent, MAX_HELD_TIME);
-	input_report_key(p->input, KEY_RESTART, !value);
-	input_sync(p->input);
+	pm_wakeup_event(input->dev.parent, MAX_HELD_TIME);
+	input_report_key(input, KEY_RESTART, !value);
+	input_sync(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 const struct {
+	const char *name;
+	irqreturn_t (*handler)(int irq, void *q);
+} hi65xx_irq_info[] = {
+	{ "down", hi65xx_power_press_isr },
+	{ "up", hi65xx_power_release_isr },
+	{ "hold 4s", 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;
+	struct input_dev *input;
+	int irq, i, error;
 
-	priv->input = devm_input_allocate_device(&pdev->dev);
-	if (!priv->input) {
+	input = devm_input_allocate_device(&pdev->dev);
+	if (!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->phys = "hisi_on/input0";
+	input->name = "HISI 65xx PowerOn Key";
 
-	input_set_capability(priv->input, EV_KEY, KEY_POWER);
-	input_set_capability(priv->input, EV_KEY, KEY_RESTART);
+	input_set_capability(input, EV_KEY, KEY_POWER);
+	input_set_capability(input, EV_KEY, KEY_RESTART);
 
-	for (i = 0; i < ID_LAST; i++) {
+	for (i = 0; i < ARRAY_SIZE(hi65xx_irq_info); i++) {
 
-		irq = platform_get_irq_byname(pdev, irq_names[i]);
+		irq = platform_get_irq_byname(pdev, hi65xx_irq_info[i].name);
 		if (irq < 0) {
-			dev_err(dev, "couldn't get irq %s\n", irq_names[i]);
-			return irq;
+			error = irq;
+			dev_err(dev, "couldn't get irq %s: %d\n",
+				hi65xx_irq_info[i].name, error);
+			return error;
 		}
 
-		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;
+		error = devm_request_any_context_irq(dev, irq,
+						     hi65xx_irq_info[i].handler,
+						     IRQF_ONESHOT,
+						     hi65xx_irq_info[i].name,
+						     input);
+		if (error < 0) {
+			dev_err(dev, "couldn't request irq %s: %d\n",
+				hi65xx_irq_info[i].name, error);
+			return error;
 		}
 	}
 
-	ret = input_register_device(priv->input);
-	if (ret) {
+	error = input_register_device(input);
+	if (error) {
 		dev_err(&pdev->dev, "failed to register input device: %d\n",
-			ret);
-		return ret;
+			error);
+		return error;
 	}
 
-	platform_set_drvdata(pdev, priv);
 	device_init_wakeup(&pdev->dev, 1);
 
 	return 0;
@@ -129,6 +124,7 @@ static int hi65xx_powerkey_probe(struct platform_device *pdev)
 static int hi65xx_powerkey_remove(struct platform_device *pdev)
 {
 	device_init_wakeup(&pdev->dev, 0);
+
 	return 0;
 }
 
@@ -139,7 +135,6 @@ static struct platform_driver hi65xx_powerkey_driver = {
 	.probe = hi65xx_powerkey_probe,
 	.remove  = hi65xx_powerkey_remove,
 };
-
 module_platform_driver(hi65xx_powerkey_driver);
 
 MODULE_AUTHOR("Zhiliang Xue <xuezhiliang@huawei.com");

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web