* [PATCH V1 2/2] input: misc: da9063: OnKey driver
2014-03-10 16:24 [PATCH V1 0/2] da9063: Support for OnKey Opensource [Steve Twiss]
@ 2014-03-10 16:24 ` Opensource [Steve Twiss]
2014-03-10 16:24 ` [PATCH V1 1/2] mfd: da9063: Linkages for ONKEY support in core files Opensource [Steve Twiss]
1 sibling, 0 replies; 5+ messages in thread
From: Opensource [Steve Twiss] @ 2014-03-10 16:24 UTC (permalink / raw)
To: Dmitry Torokhov, Lee Jones, Samuel Ortiz
Cc: David Dajun Chen, LKML-INPUT, LKML-KERNEL, Mark Brown,
Philipp Zabel
From: Opensource [Steve Twiss] <stwiss.opensource@diasemi.com>
Add the OnKey driver for DA9063.
Signed-off-by: Opensource [Steve Twiss] <stwiss.opensource@diasemi.com>
---
Checks performed with linux-next/next-20140307/scripts/checkpatch.pl
da9063-onkey.c total: 0 errors, 0 warnings, 209 lines checked
Kconfig total: 0 errors, 11 warnings, 679 lines checked
Makefile total: 0 errors, 0 warnings, 66 lines checked
Hi Dmitry,
Thank you for your previous response to my RFC.
Here are my changes. I have implemented your suggestions. Please find my
explanations below.
Changes made to this driver since previous RFC V1:
- Several alterations to the previous patch have been made according
to the comments provided by Dmitry Torokhov in the previous RFC V1
e-mail thread, see here:
http://www.spinics.net/lists/linux-input/msg30171.html
- The use of booleans for boolean data (true/false);
- The addition of an extra input_sync() in between the two calls to
input_report_key(KEY_SLEEP);
- The removal of call to dev_err() because it was unnecessary;
- A fix for the race condition during driver remove() function:
"nothing stops IRQ from firing again and rescheduling the work item".
Also, the addition of a work cancelling function during the error
path of the driver probe() after the interrupt has been registered.
The error path of the probe() function has been refactored slightly
using goto statements to make things clearer.
This fix also required a change to the way the interrupt was
registered: probe() is now using request_threaded_irq() instead of
the devm_ equivalent so that an explicit call to free_irq() can be
done before any calls to cancel_delayed_work_sync() are made;
- A clarification to the way the da9063_poll_on() function should
handle the I2C failure error case.
The key report for KEY_POWER is now only made if there has been a
fully a successful update to the DA9063_NONKEY bit in the IRQ
mask. Otherwise it will continue to re-poll until the onkey's
IRQ mask has been modified successfully.
Dependencies:
This driver makes use of the name field "ONKEY" as part of the
function call: platform_get_irq_byname();
This driver is therefore dependent on this change to the name field
in the properties of the the OnKey IORESOURCE_IRQ resource structure
(part of the mfd_cell Onkey resource inside da9063-core.c). This
change comes as part of this patch set.
This patch applies against kernel version linux-next next-20140307
Regards,
Steve Twiss, Dialog Semiconductor Ltd.
drivers/input/misc/Kconfig | 10 ++
drivers/input/misc/Makefile | 1 +
drivers/input/misc/da9063-onkey.c | 209 ++++++++++++++++++++++++++++++++++++++
3 files changed, 220 insertions(+)
create mode 100644 drivers/input/misc/da9063-onkey.c
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 762e6d2..3deb008 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -522,6 +522,16 @@ config INPUT_DA9055_ONKEY
To compile this driver as a module, choose M here: the module
will be called da9055_onkey.
+config INPUT_DA9063_ONKEY
+ tristate "Dialog DA9063 OnKey"
+ depends on MFD_DA9063
+ help
+ Support the ONKEY of Dialog DA9063 Power Management IC as an
+ input device reporting power button statue.
+
+ To compile this driver as a module, choose M here: the module
+ will be called da9063-onkey.
+
config INPUT_DM355EVM
tristate "TI DaVinci DM355 EVM Keypad and IR Remote"
depends on MFD_DM355EVM_MSP
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index cda71fc..f40caa7 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -25,6 +25,7 @@ obj-$(CONFIG_INPUT_CMA3000_I2C) += cma3000_d0x_i2c.o
obj-$(CONFIG_INPUT_COBALT_BTNS) += cobalt_btns.o
obj-$(CONFIG_INPUT_DA9052_ONKEY) += da9052_onkey.o
obj-$(CONFIG_INPUT_DA9055_ONKEY) += da9055_onkey.o
+obj-$(CONFIG_INPUT_DA9063_ONKEY) += da9063-onkey.o
obj-$(CONFIG_INPUT_DM355EVM) += dm355evm_keys.o
obj-$(CONFIG_INPUT_GP2A) += gp2ap002a00f.o
obj-$(CONFIG_INPUT_GPIO_BEEPER) += gpio-beeper.o
diff --git a/drivers/input/misc/da9063-onkey.c b/drivers/input/misc/da9063-onkey.c
new file mode 100644
index 0000000..ce08954
--- /dev/null
+++ b/drivers/input/misc/da9063-onkey.c
@@ -0,0 +1,209 @@
+/* da9063-onkey.c - Onkey device driver for DA9063
+ * Copyright (C) 2013 Dialog Semiconductor Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ */
+
+#include <linux/module.h>
+#include <linux/errno.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <linux/workqueue.h>
+#include <linux/regmap.h>
+
+#include <linux/mfd/da9063/core.h>
+#include <linux/mfd/da9063/pdata.h>
+#include <linux/mfd/da9063/registers.h>
+
+struct da9063_onkey {
+ struct da9063 *hw;
+ struct delayed_work work;
+ struct input_dev *input;
+ int irq;
+ bool key_power;
+};
+
+static void da9063_poll_on(struct work_struct *work)
+{
+ struct da9063_onkey *onkey = container_of(work, struct da9063_onkey,
+ work.work);
+ unsigned int val;
+ bool poll = true;
+ int ret;
+
+ /* poll to see when the pin is released */
+ ret = regmap_read(onkey->hw->regmap, DA9063_REG_STATUS_A, &val);
+ if (ret < 0) {
+ dev_err(&onkey->input->dev,
+ "Failed to read ON status: %d\n", ret);
+ goto err_poll;
+ }
+
+ if (!(val & DA9063_NONKEY)) {
+ ret = regmap_update_bits(onkey->hw->regmap,
+ DA9063_REG_CONTROL_B,
+ DA9063_NONKEY_LOCK, 0);
+ if (ret < 0) {
+ dev_err(&onkey->input->dev,
+ "Failed to reset the Key Delay %d\n", ret);
+ goto err_poll;
+ }
+
+ /* unmask the onkey interrupt again */
+ ret = regmap_update_bits(onkey->hw->regmap,
+ DA9063_REG_IRQ_MASK_A,
+ DA9063_NONKEY, 0);
+ if (ret < 0) {
+ dev_err(&onkey->input->dev,
+ "Failed to unmask the onkey IRQ: %d\n", ret);
+ goto err_poll;
+ }
+
+ input_report_key(onkey->input, KEY_POWER, 0);
+ input_sync(onkey->input);
+
+ poll = false;
+ }
+
+err_poll:
+ if (poll)
+ schedule_delayed_work(&onkey->work, 50);
+}
+
+static irqreturn_t da9063_onkey_irq_handler(int irq, void *data)
+{
+ struct da9063_onkey *onkey = data;
+ unsigned int val;
+ int ret;
+
+ ret = regmap_read(onkey->hw->regmap, DA9063_REG_STATUS_A, &val);
+ if (onkey->key_power && (ret >= 0) && (val & DA9063_NONKEY)) {
+ ret = regmap_update_bits(onkey->hw->regmap,
+ DA9063_REG_IRQ_MASK_A,
+ DA9063_NONKEY, 1);
+ if (ret < 0)
+ dev_err(&onkey->input->dev,
+ "Failed to mask the onkey IRQ: %d\n", ret);
+
+ input_report_key(onkey->input, KEY_POWER, 1);
+ input_sync(onkey->input);
+
+ schedule_delayed_work(&onkey->work, 0);
+ dev_dbg(&onkey->input->dev, "KEY_POWER pressed.\n");
+ } else {
+ input_report_key(onkey->input, KEY_SLEEP, 1);
+ input_sync(onkey->input);
+ input_report_key(onkey->input, KEY_SLEEP, 0);
+ input_sync(onkey->input);
+ dev_dbg(&onkey->input->dev, "KEY_SLEEP pressed.\n");
+ }
+
+ return IRQ_HANDLED;
+}
+
+static int da9063_onkey_probe(struct platform_device *pdev)
+{
+ struct da9063 *da9063 = dev_get_drvdata(pdev->dev.parent);
+ struct da9063_pdata *pdata = dev_get_platdata(da9063->dev);
+ struct da9063_onkey *onkey;
+ bool kp_tmp = true;
+ int ret = 0;
+
+ if (pdata)
+ kp_tmp = pdata->key_power;
+
+ onkey = devm_kzalloc(&pdev->dev, sizeof(struct da9063_onkey),
+ GFP_KERNEL);
+ if (!onkey) {
+ dev_err(&pdev->dev, "Failed to allocate memory.\n");
+ ret = -ENOMEM;
+ goto err;
+ }
+
+ INIT_DELAYED_WORK(&onkey->work, da9063_poll_on);
+
+ onkey->input = devm_input_allocate_device(&pdev->dev);
+ if (!onkey->input) {
+ dev_err(&pdev->dev, "Failed to allocated input device.\n");
+ ret = -ENOMEM;
+ goto err;
+ }
+
+ ret = platform_get_irq_byname(pdev, "ONKEY");
+ if (ret < 0) {
+ dev_err(&pdev->dev, "Failed to get platform IRQ.\n");
+ goto err;
+ }
+ onkey->irq = ret;
+
+ ret = request_threaded_irq(onkey->irq, NULL,
+ da9063_onkey_irq_handler,
+ IRQF_TRIGGER_LOW | IRQF_ONESHOT,
+ "ONKEY", onkey);
+ if (ret) {
+ dev_err(&pdev->dev,
+ "Failed to request input device IRQ.\n");
+ goto err;
+ }
+
+ onkey->hw = da9063;
+ onkey->key_power = kp_tmp;
+ onkey->input->evbit[0] = BIT_MASK(EV_KEY);
+ onkey->input->name = DA9063_DRVNAME_ONKEY;
+ onkey->input->phys = DA9063_DRVNAME_ONKEY "/input0";
+ onkey->input->dev.parent = &pdev->dev;
+
+ if (onkey->key_power)
+ input_set_capability(onkey->input, EV_KEY, KEY_POWER);
+ input_set_capability(onkey->input, EV_KEY, KEY_SLEEP);
+
+ ret = input_register_device(onkey->input);
+ if (ret) {
+ dev_err(&pdev->dev,
+ "Failed to register input device.\n");
+ goto err_irq;
+ }
+
+ platform_set_drvdata(pdev, onkey);
+ return 0;
+
+err_irq:
+ free_irq(onkey->irq, onkey);
+ cancel_delayed_work_sync(&onkey->work);
+err:
+ return ret;
+}
+
+static int da9063_onkey_remove(struct platform_device *pdev)
+{
+ struct da9063_onkey *onkey = platform_get_drvdata(pdev);
+ free_irq(onkey->irq, onkey);
+ cancel_delayed_work_sync(&onkey->work);
+ input_unregister_device(onkey->input);
+ return 0;
+}
+
+static struct platform_driver da9063_onkey_driver = {
+ .probe = da9063_onkey_probe,
+ .remove = da9063_onkey_remove,
+ .driver = {
+ .name = DA9063_DRVNAME_ONKEY,
+ .owner = THIS_MODULE,
+ },
+};
+
+module_platform_driver(da9063_onkey_driver);
+
+MODULE_AUTHOR("S Twiss <stwiss.opensource@diasemi.com>");
+MODULE_DESCRIPTION("Onkey device driver for Dialog DA9063");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DA9063_DRVNAME_ONKEY);
--
end-of-patch for PATCH V1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH V1 1/2] mfd: da9063: Linkages for ONKEY support in core files
2014-03-10 16:24 [PATCH V1 0/2] da9063: Support for OnKey Opensource [Steve Twiss]
2014-03-10 16:24 ` [PATCH V1 2/2] input: misc: da9063: OnKey driver Opensource [Steve Twiss]
@ 2014-03-10 16:24 ` Opensource [Steve Twiss]
2014-03-10 16:40 ` Lee Jones
1 sibling, 1 reply; 5+ messages in thread
From: Opensource [Steve Twiss] @ 2014-03-10 16:24 UTC (permalink / raw)
To: Dmitry Torokhov, Lee Jones, Samuel Ortiz
Cc: David Dajun Chen, LKML-INPUT, LKML-KERNEL, Mark Brown,
Philipp Zabel
From: Opensource [Steve Twiss] <stwiss.opensource@diasemi.com>
This change adds the name field "ONKEY" to the properties of the
the OnKey IORESOURCE_IRQ resource structure (part of the mfd_cell
Onkey resource).
The addition of bool key_power which will be passed to the onkey
driver and allow KEY_POWER support to be turned on/off as a
driver configuration option.
Signed-off-by: Opensource [Steve Twiss] <stwiss.opensource@diasemi.com>
---
Checks performed with linux-next/next-20140307/scripts/checkpatch.pl
da9063-core.c total: 0 errors, 0 warnings, 189 lines checked
pdata.h total: 0 errors, 0 warnings, 112 lines checked
This change is a dependency for the new DA9063 OnKey driver which
forms the remainder of this patch set.
This patch applies against kernel linux-next next-20140307
Regards,
Steve Twiss, Dialog Semiconductor Ltd.
drivers/mfd/da9063-core.c | 1 +
include/linux/mfd/da9063/pdata.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/drivers/mfd/da9063-core.c b/drivers/mfd/da9063-core.c
index e70ae31..b410a14 100644
--- a/drivers/mfd/da9063-core.c
+++ b/drivers/mfd/da9063-core.c
@@ -60,6 +60,7 @@ static struct resource da9063_rtc_resources[] = {
static struct resource da9063_onkey_resources[] = {
{
+ .name = "ONKEY",
.start = DA9063_IRQ_ONKEY,
.end = DA9063_IRQ_ONKEY,
.flags = IORESOURCE_IRQ,
diff --git a/include/linux/mfd/da9063/pdata.h b/include/linux/mfd/da9063/pdata.h
index 95c8742..612383b 100644
--- a/include/linux/mfd/da9063/pdata.h
+++ b/include/linux/mfd/da9063/pdata.h
@@ -103,6 +103,7 @@ struct da9063;
struct da9063_pdata {
int (*init)(struct da9063 *da9063);
int irq_base;
+ bool key_power;
unsigned flags;
struct da9063_regulators_pdata *regulators_pdata;
struct led_platform_data *leds_pdata;
--
end-of-patch for PATCH V1
^ permalink raw reply related [flat|nested] 5+ messages in thread