Hi Dmitry,
Delay time to query the power release button has been increased from 10ms to 50ms.
Removed extra schedule; now "onkey work" is called from the threaded irq itself.
Kconfig has been updated with the statement "To compile this module..."
Signed-off-by: Ashish Jangam <[email protected]>
David Dajun Chen <[email protected]>
---
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index f9cf088..cf687a2 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -353,6 +353,16 @@ config INPUT_RB532_BUTTON
To compile this driver as a module, choose M here: the
module will be called rb532_button.
+config INPUT_DA9052_ONKEY
+ tristate "Dialog DA9052 Onkey"
+ depends on PMIC_DA9052
+ help
+ Support the ONKEY of Dialog DA9052 PMICs as an input device
+ reporting power button status.
+
+ To compile this driver as a module, choose M here: the
+ module will be called da9052_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 e3f7984..d35d466 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_INPUT_CM109) += cm109.o
obj-$(CONFIG_INPUT_CMA3000) += cma3000_d0x.o
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_DM355EVM) += dm355evm_keys.o
obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o
obj-$(CONFIG_INPUT_IXP4XX_BEEPER) += ixp4xx-beeper.o
diff --git a/drivers/input/misc/da9052_onkey.c b/drivers/input/misc/da9052_onkey.c
new file mode 100755
index 0000000..83b1693
--- /dev/null
+++ b/drivers/input/misc/da9052_onkey.c
@@ -0,0 +1,180 @@
+/*
+ * ON pin driver for Dialog DA9052 PMICs
+ *
+ * Copyright(c) 2011 Dialog Semiconductor Ltd.
+ *
+ * Author: David Dajun Chen <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/init.h>
+#include <linux/input.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/workqueue.h>
+
+#include <linux/mfd/da9052/da9052.h>
+#include <linux/mfd/da9052/reg.h>
+
+struct da9052_onkey {
+ struct da9052 *da9052;
+ struct input_dev *input;
+ struct delayed_work work;
+ int irq;
+};
+
+static void da9052_onkey_query(struct da9052_onkey *onkey)
+{
+ int ret;
+
+ ret = da9052_reg_read(onkey->da9052, DA9052_EVENT_B_REG);
+ if (ret < 0) {
+ dev_err(onkey->da9052->dev,
+ "da9052_onkey_report_event da9052_reg_read error %d\n",
+ ret);
+ ret = 1;
+ } else {
+ ret = ret & DA9052_E_nONKEY;
+ input_report_key(onkey->input, KEY_POWER, ret);
+ input_sync(onkey->input);
+ }
+
+ if (ret)
+ schedule_delayed_work(&onkey->work, msecs_to_jiffies(50));
+}
+
+static void da9052_onkey_work(struct work_struct *work)
+{
+ struct da9052_onkey *onkey = container_of(work, struct da9052_onkey,
+ work.work);
+
+ da9052_onkey_query(onkey);
+}
+
+static irqreturn_t da9052_onkey_irq(int irq, void *data)
+{
+ struct da9052_onkey *onkey = data;
+
+ da9052_onkey_work(&onkey->work.work);
+
+ return IRQ_HANDLED;
+}
+
+static int __devinit da9052_onkey_probe(struct platform_device *pdev)
+{
+ struct da9052_onkey *onkey;
+ int error;
+
+ onkey = kzalloc(sizeof(*onkey), GFP_KERNEL);
+ if (!onkey) {
+ dev_err(&pdev->dev, "Failed to allocate memory\n");
+ return -ENOMEM;
+ }
+
+ onkey->input = input_allocate_device();
+ if (!onkey->input) {
+ error = -ENOMEM;
+ dev_err(&pdev->dev, "Failed to allocate input device, %d\n",
+ error);
+ goto err_mem;
+ }
+
+ onkey->da9052 = dev_get_drvdata(pdev->dev.parent);
+ if (!onkey->da9052) {
+ error = -ENOMEM;
+ dev_err(&pdev->dev, "Failed to get the driver's data, %d\n",
+ error);
+ goto err_input;
+ }
+
+ onkey->irq = platform_get_irq_byname(pdev, "ONKEY");
+ if (onkey->irq < 0) {
+ error = -ENXIO;
+ dev_err(&pdev->dev,
+ "Failed to get an IRQ for input device, %d\n",
+ onkey->irq);
+ goto err_input;
+ }
+
+ onkey->input->evbit[0] = BIT_MASK(EV_KEY);
+ onkey->input->keybit[BIT_WORD(KEY_POWER)] = BIT_MASK(KEY_POWER);
+ onkey->input->name = "da9052-onkey";
+ onkey->input->phys = "da9052-onkey/input0";
+ onkey->input->dev.parent = &pdev->dev;
+
+ INIT_DELAYED_WORK(&onkey->work, da9052_onkey_work);
+
+ error = request_threaded_irq(onkey->da9052->irq_base + onkey->irq, NULL,
+ da9052_onkey_irq,
+ IRQF_TRIGGER_LOW | IRQF_ONESHOT,
+ "ONKEY", onkey);
+ if (error < 0) {
+ dev_err(onkey->da9052->dev,
+ "Failed to register ONKEY IRQ %d, error = %d\n",
+ onkey->da9052->irq_base + onkey->irq, error);
+ goto err_req_irq;
+ }
+
+ error = input_register_device(onkey->input);
+ if (error) {
+ dev_err(&pdev->dev, "Unable to register input device, %d\n",
+ error);
+ goto err_irq;
+ }
+
+ platform_set_drvdata(pdev, onkey);
+
+ return 0;
+
+err_irq:
+ free_irq(onkey->da9052->irq_base + onkey->irq, onkey);
+err_req_irq:
+ cancel_delayed_work_sync(&onkey->work);
+err_input:
+ input_free_device(onkey->input);
+err_mem:
+ kfree(onkey);
+ return error;
+}
+
+static int __devexit da9052_onkey_remove(struct platform_device *pdev)
+{
+ struct da9052_onkey *onkey = platform_get_drvdata(pdev);
+
+ free_irq(onkey->da9052->irq_base + onkey->irq, onkey);
+ cancel_delayed_work_sync(&onkey->work);
+ input_unregister_device(onkey->input);
+ kfree(onkey);
+
+ return 0;
+}
+
+static struct platform_driver da9052_onkey_driver = {
+ .driver = {
+ .name = "da9052-onkey",
+ .owner = THIS_MODULE,
+ },
+ .probe = da9052_onkey_probe,
+ .remove = __devexit_p(da9052_onkey_remove),
+};
+
+static int __init da9052_onkey_init(void)
+{
+ return platform_driver_register(&da9052_onkey_driver);
+}
+module_init(da9052_onkey_init);
+
+static void __exit da9052_onkey_exit(void)
+{
+ platform_driver_unregister(&da9052_onkey_driver);
+}
+module_exit(da9052_onkey_exit);
+
+MODULE_AUTHOR("David Dajun Chen <[email protected]>");
+MODULE_DESCRIPTION("Onkey driver for DA9052");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:da9052-onkey");
Regards,
Ashish
????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay? ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m???? ????????I?
Hi Ashish,
On Fri, May 20, 2011 at 03:10:47PM +0530, Ashish Jangam wrote:
> Hi Dmitry,
>
> Delay time to query the power release button has been increased from 10ms to 50ms.
> Removed extra schedule; now "onkey work" is called from the threaded irq itself.
> Kconfig has been updated with the statement "To compile this module..."
>
> Signed-off-by: Ashish Jangam <[email protected]>
> David Dajun Chen <[email protected]>
This should be 2 separate signed-off-by lines, the first one by David
and the 2nd one is yours. Otherwise:
Acked-by: Dmitry Torokhov <[email protected]>
I assume it will be merged with the rest of DA9052 code through Samuel's
MFD tree, right?
Thanks.
> ---
> diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
> index f9cf088..cf687a2 100644
> --- a/drivers/input/misc/Kconfig
> +++ b/drivers/input/misc/Kconfig
> @@ -353,6 +353,16 @@ config INPUT_RB532_BUTTON
> To compile this driver as a module, choose M here: the
> module will be called rb532_button.
>
> +config INPUT_DA9052_ONKEY
> + tristate "Dialog DA9052 Onkey"
> + depends on PMIC_DA9052
> + help
> + Support the ONKEY of Dialog DA9052 PMICs as an input device
> + reporting power button status.
> +
> + To compile this driver as a module, choose M here: the
> + module will be called da9052_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 e3f7984..d35d466 100644
> --- a/drivers/input/misc/Makefile
> +++ b/drivers/input/misc/Makefile
> @@ -21,6 +21,7 @@ obj-$(CONFIG_INPUT_CM109) += cm109.o
> obj-$(CONFIG_INPUT_CMA3000) += cma3000_d0x.o
> 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_DM355EVM) += dm355evm_keys.o
> obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o
> obj-$(CONFIG_INPUT_IXP4XX_BEEPER) += ixp4xx-beeper.o
> diff --git a/drivers/input/misc/da9052_onkey.c b/drivers/input/misc/da9052_onkey.c
> new file mode 100755
> index 0000000..83b1693
> --- /dev/null
> +++ b/drivers/input/misc/da9052_onkey.c
> @@ -0,0 +1,180 @@
> +/*
> + * ON pin driver for Dialog DA9052 PMICs
> + *
> + * Copyright(c) 2011 Dialog Semiconductor Ltd.
> + *
> + * Author: David Dajun Chen <[email protected]>
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms of the GNU General Public License as published by the
> + * Free Software Foundation; either version 2 of the License, or (at your
> + * option) any later version.
> + */
> +
> +#include <linux/init.h>
> +#include <linux/input.h>
> +#include <linux/module.h>
> +#include <linux/platform_device.h>
> +#include <linux/workqueue.h>
> +
> +#include <linux/mfd/da9052/da9052.h>
> +#include <linux/mfd/da9052/reg.h>
> +
> +struct da9052_onkey {
> + struct da9052 *da9052;
> + struct input_dev *input;
> + struct delayed_work work;
> + int irq;
> +};
> +
> +static void da9052_onkey_query(struct da9052_onkey *onkey)
> +{
> + int ret;
> +
> + ret = da9052_reg_read(onkey->da9052, DA9052_EVENT_B_REG);
> + if (ret < 0) {
> + dev_err(onkey->da9052->dev,
> + "da9052_onkey_report_event da9052_reg_read error %d\n",
> + ret);
> + ret = 1;
> + } else {
> + ret = ret & DA9052_E_nONKEY;
> + input_report_key(onkey->input, KEY_POWER, ret);
> + input_sync(onkey->input);
> + }
> +
> + if (ret)
> + schedule_delayed_work(&onkey->work, msecs_to_jiffies(50));
> +}
> +
> +static void da9052_onkey_work(struct work_struct *work)
> +{
> + struct da9052_onkey *onkey = container_of(work, struct da9052_onkey,
> + work.work);
> +
> + da9052_onkey_query(onkey);
> +}
> +
> +static irqreturn_t da9052_onkey_irq(int irq, void *data)
> +{
> + struct da9052_onkey *onkey = data;
> +
> + da9052_onkey_work(&onkey->work.work);
> +
> + return IRQ_HANDLED;
> +}
> +
> +static int __devinit da9052_onkey_probe(struct platform_device *pdev)
> +{
> + struct da9052_onkey *onkey;
> + int error;
> +
> + onkey = kzalloc(sizeof(*onkey), GFP_KERNEL);
> + if (!onkey) {
> + dev_err(&pdev->dev, "Failed to allocate memory\n");
> + return -ENOMEM;
> + }
> +
> + onkey->input = input_allocate_device();
> + if (!onkey->input) {
> + error = -ENOMEM;
> + dev_err(&pdev->dev, "Failed to allocate input device, %d\n",
> + error);
> + goto err_mem;
> + }
> +
> + onkey->da9052 = dev_get_drvdata(pdev->dev.parent);
> + if (!onkey->da9052) {
> + error = -ENOMEM;
> + dev_err(&pdev->dev, "Failed to get the driver's data, %d\n",
> + error);
> + goto err_input;
> + }
> +
> + onkey->irq = platform_get_irq_byname(pdev, "ONKEY");
> + if (onkey->irq < 0) {
> + error = -ENXIO;
> + dev_err(&pdev->dev,
> + "Failed to get an IRQ for input device, %d\n",
> + onkey->irq);
> + goto err_input;
> + }
> +
> + onkey->input->evbit[0] = BIT_MASK(EV_KEY);
> + onkey->input->keybit[BIT_WORD(KEY_POWER)] = BIT_MASK(KEY_POWER);
> + onkey->input->name = "da9052-onkey";
> + onkey->input->phys = "da9052-onkey/input0";
> + onkey->input->dev.parent = &pdev->dev;
> +
> + INIT_DELAYED_WORK(&onkey->work, da9052_onkey_work);
> +
> + error = request_threaded_irq(onkey->da9052->irq_base + onkey->irq, NULL,
> + da9052_onkey_irq,
> + IRQF_TRIGGER_LOW | IRQF_ONESHOT,
> + "ONKEY", onkey);
> + if (error < 0) {
> + dev_err(onkey->da9052->dev,
> + "Failed to register ONKEY IRQ %d, error = %d\n",
> + onkey->da9052->irq_base + onkey->irq, error);
> + goto err_req_irq;
> + }
> +
> + error = input_register_device(onkey->input);
> + if (error) {
> + dev_err(&pdev->dev, "Unable to register input device, %d\n",
> + error);
> + goto err_irq;
> + }
> +
> + platform_set_drvdata(pdev, onkey);
> +
> + return 0;
> +
> +err_irq:
> + free_irq(onkey->da9052->irq_base + onkey->irq, onkey);
> +err_req_irq:
> + cancel_delayed_work_sync(&onkey->work);
> +err_input:
> + input_free_device(onkey->input);
> +err_mem:
> + kfree(onkey);
> + return error;
> +}
> +
> +static int __devexit da9052_onkey_remove(struct platform_device *pdev)
> +{
> + struct da9052_onkey *onkey = platform_get_drvdata(pdev);
> +
> + free_irq(onkey->da9052->irq_base + onkey->irq, onkey);
> + cancel_delayed_work_sync(&onkey->work);
> + input_unregister_device(onkey->input);
> + kfree(onkey);
> +
> + return 0;
> +}
> +
> +static struct platform_driver da9052_onkey_driver = {
> + .driver = {
> + .name = "da9052-onkey",
> + .owner = THIS_MODULE,
> + },
> + .probe = da9052_onkey_probe,
> + .remove = __devexit_p(da9052_onkey_remove),
> +};
> +
> +static int __init da9052_onkey_init(void)
> +{
> + return platform_driver_register(&da9052_onkey_driver);
> +}
> +module_init(da9052_onkey_init);
> +
> +static void __exit da9052_onkey_exit(void)
> +{
> + platform_driver_unregister(&da9052_onkey_driver);
> +}
> +module_exit(da9052_onkey_exit);
> +
> +MODULE_AUTHOR("David Dajun Chen <[email protected]>");
> +MODULE_DESCRIPTION("Onkey driver for DA9052");
> +MODULE_LICENSE("GPL");
> +MODULE_ALIAS("platform:da9052-onkey");
>
>
> Regards,
> Ashish
>
>
--
Dmitry
Hi Dmitry,
> -----Original Message-----
> From: Dmitry Torokhov [mailto:[email protected]]
> Sent: Monday, May 23, 2011 10:25 PM
> To: Ashish Jangam
> Cc: [email protected]; Dajun Chen
> Subject: Re: [PATCHv3 11/11 ] ONKEY: Removed extra schedule call
>
> Hi Ashish,
>
> On Fri, May 20, 2011 at 03:10:47PM +0530, Ashish Jangam wrote:
> > Hi Dmitry,
> >
> > Delay time to query the power release button has been increased from 10ms to
> 50ms.
> > Removed extra schedule; now "onkey work" is called from the threaded irq
> itself.
> > Kconfig has been updated with the statement "To compile this module..."
> >
> > Signed-off-by: Ashish Jangam <[email protected]>
> > David Dajun Chen <[email protected]>
>
> This should be 2 separate signed-off-by lines, the first one by David
> and the 2nd one is yours. Otherwise:
Ok, this will be taken care of.
>
> Acked-by: Dmitry Torokhov <[email protected]>
>
> I assume it will be merged with the rest of DA9052 code through Samuel's
> MFD tree, right?
Yes. Since rest of the ack modules like LED, RTC will follow the same process of merging.
>
> Thanks.
>
> --
> Dmitry
Regards,
Ashish
????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay? ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m???? ????????I?