diff options
Diffstat (limited to 'drivers/input/misc/pcf50633-input.c')
| -rw-r--r-- | drivers/input/misc/pcf50633-input.c | 117 |
1 files changed, 63 insertions, 54 deletions
diff --git a/drivers/input/misc/pcf50633-input.c b/drivers/input/misc/pcf50633-input.c index a3cc4d680e9..039dcb00ebd 100644 --- a/drivers/input/misc/pcf50633-input.c +++ b/drivers/input/misc/pcf50633-input.c @@ -1,4 +1,4 @@ -/* Philips PCF50633 Input Driver +/* NXP PCF50633 Input Driver * * (C) 2006-2008 by Openmoko, Inc. * Author: Balaji Rao <balajirrao@openmoko.org> @@ -7,97 +7,106 @@ * Broken down from monstrous PCF50633 driver mainly by * Harald Welte, Andy Green and Werner Almesberger * - * 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. + * 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. * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA */ +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/init.h> +#include <linux/device.h> +#include <linux/platform_device.h> #include <linux/input.h> #include <linux/mfd/pcf50633/core.h> -#include <linux/mfd/pcf50633/input.h> + +#define PCF50633_OOCSTAT_ONKEY 0x01 +#define PCF50633_REG_OOCSTAT 0x12 +#define PCF50633_REG_OOCMODE 0x10 + +struct pcf50633_input { + struct pcf50633 *pcf; + struct input_dev *input_dev; +}; static void -pcf50633_input_irq(struct pcf50633 *pcf, int irq, void *data) +pcf50633_input_irq(int irq, void *data) { - struct input_dev *input_dev = pcf->input.input_dev; + struct pcf50633_input *input; int onkey_released; - /* We report only one event depending on if the key status */ - onkey_released = pcf50633_reg_read(pcf, PCF50633_REG_OOCSTAT) & - PCF50633_OOCSTAT_ONKEY; + input = data; + + /* We report only one event depending on the key press status */ + onkey_released = pcf50633_reg_read(input->pcf, PCF50633_REG_OOCSTAT) + & PCF50633_OOCSTAT_ONKEY; if (irq == PCF50633_IRQ_ONKEYF && !onkey_released) - input_report_key(input_dev, KEY_POWER, 1); + input_report_key(input->input_dev, KEY_POWER, 1); else if (irq == PCF50633_IRQ_ONKEYR && onkey_released) - input_report_key(input_dev, KEY_POWER, 0); + input_report_key(input->input_dev, KEY_POWER, 0); - input_sync(input_dev); + input_sync(input->input_dev); } -int __init pcf50633_input_probe(struct platform_device *pdev) +static int __devinit pcf50633_input_probe(struct platform_device *pdev) { - struct pcf50633 *pcf; + struct pcf50633_input *input; + struct pcf50633_subdev_pdata *pdata = pdev->dev.platform_data; struct input_dev *input_dev; int ret; - pcf = platform_get_drvdata(pdev); + + input = kzalloc(sizeof(*input), GFP_KERNEL); + if (!input) + return -ENOMEM; input_dev = input_allocate_device(); - if (!input_dev) - return -ENODEV; + if (!input_dev) { + kfree(input); + return -ENOMEM; + } - input_dev->name = "GTA02 PMU events"; - input_dev->id.bustype = BUS_I2C; + platform_set_drvdata(pdev, input); + input->pcf = pdata->pcf; + input->input_dev = input_dev; + input_dev->name = "PCF50633 PMU events"; + input_dev->id.bustype = BUS_I2C; input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_PWR); set_bit(KEY_POWER, input_dev->keybit); - set_bit(KEY_POWER2, input_dev->keybit); ret = input_register_device(input_dev); - if (ret) - goto out; - - pcf->input.input_dev = input_dev; - - /* Currently we care only about ONKEY and USBINS/USBREM - * - * USBINS/USBREM are told to us by mbc driver as we can't setup - * two handlers for an IRQ - */ - pcf->irq_handler[PCF50633_IRQ_ONKEYR].handler = pcf50633_input_irq; - - pcf->irq_handler[PCF50633_IRQ_ONKEYF].handler = pcf50633_input_irq; + if (ret) { + input_free_device(input_dev); + kfree(input); + return ret; + } + pcf50633_register_irq(pdata->pcf, PCF50633_IRQ_ONKEYR, + pcf50633_input_irq, input); + pcf50633_register_irq(pdata->pcf, PCF50633_IRQ_ONKEYF, + pcf50633_input_irq, input); return 0; - -out: - input_free_device(input_dev); - return ret; } static int __devexit pcf50633_input_remove(struct platform_device *pdev) { - struct pcf50633 *pcf; + struct pcf50633_input *input = platform_get_drvdata(pdev); + + pcf50633_free_irq(input->pcf, PCF50633_IRQ_ONKEYR); + pcf50633_free_irq(input->pcf, PCF50633_IRQ_ONKEYF); - pcf = platform_get_drvdata(pdev); - input_unregister_device(pcf->input.input_dev); + input_unregister_device(input->input_dev); + kfree(input); return 0; } -struct platform_driver pcf50633_input_driver = { +static struct platform_driver pcf50633_input_driver = { .driver = { .name = "pcf50633-input", }, @@ -107,13 +116,13 @@ struct platform_driver pcf50633_input_driver = { static int __init pcf50633_input_init(void) { - return platform_driver_register(&pcf50633_input_driver); + return platform_driver_register(&pcf50633_input_driver); } module_init(pcf50633_input_init); static void __exit pcf50633_input_exit(void) { - platform_driver_unregister(&pcf50633_input_driver); + platform_driver_unregister(&pcf50633_input_driver); } module_exit(pcf50633_input_exit); |