Diff
Modified: trunk/drivers/input/misc/Kconfig (5841 => 5842)
--- trunk/drivers/input/misc/Kconfig 2008-12-09 09:14:57 UTC (rev 5841)
+++ trunk/drivers/input/misc/Kconfig 2008-12-09 13:12:10 UTC (rev 5842)
@@ -220,14 +220,14 @@
Say Y here if you want to support the built-in real time clock
of the HP SDC controller.
-config TWI_KEYPAD
- tristate "TWI/I2C Keypad input device"
+config CONFIG_INPUT_PCF8574
+ tristate "PCF8574 Keypad input device"
depends on I2C && EXPERIMENTAL
help
- Say Y here if you want to support a 4x4 keypad matrix for input
- subsystem. The keypad is connetced via I2C with a PCF8574.
+ Say Y here if you want to support a keypad connetced via I2C
+ with a PCF8574.
To compile this driver as a module, choose M here: the
- module will be called twi_keypad.
+ module will be called pcf8574_keypad.
endif
Modified: trunk/drivers/input/misc/Makefile (5841 => 5842)
--- trunk/drivers/input/misc/Makefile 2008-12-09 09:14:57 UTC (rev 5841)
+++ trunk/drivers/input/misc/Makefile 2008-12-09 13:12:10 UTC (rev 5842)
@@ -8,7 +8,7 @@
obj-$(CONFIG_INPUT_PCSPKR) += pcspkr.o
obj-$(CONFIG_INPUT_M68K_BEEP) += m68kspkr.o
obj-$(CONFIG_INPUT_IXP4XX_BEEPER) += ixp4xx-beeper.o
-obj-$(CONFIG_TWI_KEYPAD) += twi_keypad.o
+obj-$(CONFIG_INPUT_PCF8574) += pcf8574_keypad.o
obj-$(CONFIG_INPUT_COBALT_BTNS) += cobalt_btns.o
obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o
obj-$(CONFIG_INPUT_ATLAS_BTNS) += atlas_btns.o
Copied: trunk/drivers/input/misc/pcf8574_keypad.c (from rev 5794, trunk/drivers/input/misc/twi_keypad.c) (0 => 5842)
--- trunk/drivers/input/misc/pcf8574_keypad.c (rev 0)
+++ trunk/drivers/input/misc/pcf8574_keypad.c 2008-12-09 13:12:10 UTC (rev 5842)
@@ -0,0 +1,278 @@
+/*
+ * Driver for a keypad w/16 buttons connected to a PCF8574 I2C I/O expander
+ *
+ * Copyright 2005-2008 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/i2c.h>
+#include <linux/workqueue.h>
+
+#define DRV_NAME "pcf8574_keypad"
+
+MODULE_AUTHOR("Michael Hennerich");
+MODULE_DESCRIPTION("Keypad input driver for 16 keys connected to PCF8574");
+MODULE_LICENSE("GPL");
+
+static unsigned char pcf8574_kp_btncode[] = {
+ [0] = KEY_RESERVED,
+ [1] = KEY_ENTER,
+ [2] = KEY_BACKSLASH,
+ [3] = KEY_0,
+ [4] = KEY_RIGHTBRACE,
+ [5] = KEY_C,
+ [6] = KEY_9,
+ [7] = KEY_8,
+ [8] = KEY_7,
+ [9] = KEY_B,
+ [10] = KEY_6,
+ [11] = KEY_5,
+ [12] = KEY_4,
+ [13] = KEY_A,
+ [14] = KEY_3,
+ [15] = KEY_2,
+ [16] = KEY_1
+};
+
+struct kp_data {
+ unsigned char *btncode;
+ struct input_dev *idev;
+ struct i2c_client *client;
+ char name[64];
+ char phys[32];
+ unsigned char laststate;
+ unsigned char statechanged;
+ unsigned long irq_handled;
+ unsigned long events_sended;
+ unsigned long events_processed;
+ struct work_struct pcf8574_kp_work;
+};
+
+static short read_state(struct kp_data *lp)
+{
+ unsigned char x, y, a, b;
+
+ if (lp->client) {
+ i2c_smbus_write_byte(lp->client, 240);
+ x = 0xF & (~(i2c_smbus_read_byte(lp->client) >> 4));
+
+ i2c_smbus_write_byte(lp->client, 15);
+ y = 0xF & (~i2c_smbus_read_byte(lp->client));
+
+ for (a = 0; x > 0; a++)
+ x = x >> 1;
+ for (b = 0; y > 0; b++)
+ y = y >> 1;
+
+ return ((a - 1) * 4) + b;
+ }
+
+ return -1;
+}
+
+static void check_and_notify(struct work_struct *work)
+{
+ struct kp_data *lp =
+ container_of(work, struct kp_data, pcf8574_kp_work);
+ unsigned char nextstate = read_state(lp);
+
+ lp->statechanged = lp->laststate ^ nextstate;
+
+ if (lp->statechanged) {
+ input_report_key(lp->idev,
+ nextstate > 17 ? lp->btncode[lp->laststate] :
+ lp->btncode[nextstate],
+ nextstate > 17 ? 0 : 1);
+
+ lp->events_sended++;
+ }
+ lp->laststate = nextstate;
+ input_sync(lp->idev);
+ enable_irq(lp->client->irq);
+}
+
+static irqreturn_t pcf8574_kp_irq_handler(int irq, void *dev_id)
+{
+ struct kp_data *lp = dev_id;
+
+ disable_irq_nosync(lp->client->irq);
+ schedule_work(&lp->pcf8574_kp_work);
+
+ return IRQ_HANDLED;
+}
+
+static int __devinit pcf8574_kp_probe(struct i2c_client *client, const struct i2c_device_id *id)
+{
+ int i, ret;
+ struct input_dev *idev;
+ struct kp_data *lp;
+
+ if (i2c_smbus_write_byte(client, 240) < 0) {
+ dev_err(&client->dev, "probe: write fail\n");
+ return -ENODEV;
+ }
+
+ lp = kzalloc(sizeof(struct kp_data), GFP_KERNEL);
+ if (!lp)
+ return -ENOMEM;
+ lp->client = client;
+
+ i2c_set_clientdata(client, lp);
+
+ if (client->irq > 0) {
+ ret = request_irq(client->irq, pcf8574_kp_irq_handler,
+ IRQF_TRIGGER_LOW, DRV_NAME, lp);
+ if (ret) {
+ dev_err(&client->dev, "IRQ %d is not free\n", client->irq);
+ goto fail_irq;
+ }
+ } else
+ dev_warn(&client->dev, "IRQ not configured!\n");
+
+
+ idev = input_allocate_device();
+ if (!idev) {
+ dev_err(&client->dev, "Can't allocate input device\n");
+ ret = -ENOMEM;
+ goto fail_allocate;
+ }
+
+ lp->idev = idev;
+ lp->btncode = pcf8574_kp_btncode;
+
+ idev->evbit[0] = 0;
+
+ idev->evbit[0] |= BIT_MASK(EV_KEY);
+ idev->keycode = lp->btncode;
+ idev->keycodesize = sizeof(pcf8574_kp_btncode);
+ idev->keycodemax = ARRAY_SIZE(pcf8574_kp_btncode);
+
+ for (i = 0; i < ARRAY_SIZE(pcf8574_kp_btncode); ++i)
+ __set_bit(lp->btncode[i] & KEY_MAX, idev->keybit);
+
+ __clear_bit(KEY_RESERVED, idev->keybit);
+
+ sprintf(lp->name, DRV_NAME);
+ sprintf(lp->phys, "kp_data/input0");
+
+ idev->name = lp->name;
+ idev->phys = lp->phys;
+ idev->id.bustype = BUS_I2C;
+ idev->id.vendor = 0x0001;
+ idev->id.product = 0x0001;
+ idev->id.version = 0x0100;
+
+ input_set_drvdata(idev, lp);
+
+ ret = input_register_device(lp->idev);
+ if (ret) {
+ dev_err(&client->dev, "input_register_device() failed\n");
+ goto fail_register;
+ }
+
+ lp->statechanged = 0x0;
+
+ lp->laststate = read_state(lp);
+
+ /* Set up our workqueue. */
+ INIT_WORK(&lp->pcf8574_kp_work, check_and_notify);
+
+ dev_info(&client->dev, "input: %s at %s IRQ %d\n", lp->name, lp->phys,
+ client->irq);
+
+ return 0;
+
+ fail_register:
+ input_set_drvdata(idev, NULL);
+ input_free_device(idev);
+ fail_allocate:
+ free_irq(client->irq, lp);
+ fail_irq:
+ i2c_set_clientdata(client, NULL);
+ kfree(lp);
+
+ return ret;
+}
+
+static int __devexit pcf8574_kp_remove(struct i2c_client *client)
+{
+ struct kp_data *lp = i2c_get_clientdata(client);
+
+ if (client->irq > 0)
+ free_irq(client->irq, lp);
+
+ input_set_drvdata(lp->idev, NULL);
+ input_unregister_device(lp->idev);
+ kfree(lp);
+
+ i2c_set_clientdata(client, NULL);
+
+ return 0;
+}
+
+#ifdef CONFIG_PM
+static int pcf8574_kp_resume(struct i2c_client *client)
+{
+ struct kp_data *lp = i2c_get_clientdata(client);
+ int ret;
+
+ if (client->irq > 0) {
+ ret = request_irq(client->irq, pcf8574_kp_irq_handler,
+ IRQF_TRIGGER_LOW, DRV_NAME, lp);
+ if (ret) {
+ dev_err(&client->dev, "IRQ %d is not free\n", client->irq);
+ return -ENODEV;
+ }
+ }
+
+ return 0;
+}
+
+static int pcf8574_kp_suspend(struct i2c_client *client, pm_message_t mesg)
+{
+ struct kp_data *lp = i2c_get_clientdata(client);
+
+ if (client->irq > 0)
+ free_irq(client->irq, lp);
+
+ return 0;
+}
+#else
+# define pcf8574_kp_resume NULL
+# define pcf8574_kp_suspend NULL
+#endif
+
+static const struct i2c_device_id pcf8574_kp_id[] = {
+ { DRV_NAME, 0 },
+ { }
+};
+MODULE_DEVICE_TABLE(i2c, pcf8574_kp_id);
+
+static struct i2c_driver pcf8574_kp_driver = {
+ .driver = {
+ .name = DRV_NAME,
+ },
+ .probe = pcf8574_kp_probe,
+ .remove = __devexit_p(pcf8574_kp_remove),
+ .suspend = pcf8574_kp_suspend,
+ .resume = pcf8574_kp_resume,
+ .id_table = pcf8574_kp_id,
+};
+
+static int __init pcf8574_kp_init(void)
+{
+ return i2c_add_driver(&pcf8574_kp_driver);
+}
+
+static void __exit pcf8574_kp_exit(void)
+{
+ i2c_del_driver(&pcf8574_kp_driver);
+}
+
+module_init(pcf8574_kp_init);
+module_exit(pcf8574_kp_exit);
Property changes: trunk/drivers/input/misc/pcf8574_keypad.c
Name: svn:keywords
+ Author Date Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
Deleted: trunk/drivers/input/misc/twi_keypad.c (5841 => 5842)
--- trunk/drivers/input/misc/twi_keypad.c 2008-12-09 09:14:57 UTC (rev 5841)
+++ trunk/drivers/input/misc/twi_keypad.c 2008-12-09 13:12:10 UTC (rev 5842)
@@ -1,280 +0,0 @@
-/*
- * TWI Driver for an 4x4 Keybaord Matrix connected to a PCF8574 I2C IO expander
- *
- * Copyright 2005-2008 Analog Devices Inc.
- *
- * Enter bugs at http://blackfin.uclinux.org/
- *
- * Licensed under the GPL-2 or later.
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/input.h>
-#include <linux/interrupt.h>
-#include <linux/i2c.h>
-#include <linux/workqueue.h>
-
-MODULE_AUTHOR("Michael Hennerich <[EMAIL PROTECTED]>");
-MODULE_DESCRIPTION("TWI Keypad input driver");
-MODULE_LICENSE("GPL");
-
-static unsigned char twi_keypad_btncode[] = {
- [0] = KEY_RESERVED,
- [1] = KEY_ENTER,
- [2] = KEY_BACKSLASH,
- [3] = KEY_0,
- [4] = KEY_RIGHTBRACE,
- [5] = KEY_C,
- [6] = KEY_9,
- [7] = KEY_8,
- [8] = KEY_7,
- [9] = KEY_B,
- [10] = KEY_6,
- [11] = KEY_5,
- [12] = KEY_4,
- [13] = KEY_A,
- [14] = KEY_3,
- [15] = KEY_2,
- [16] = KEY_1
-};
-
-struct twikeypad {
- unsigned char *btncode;
- struct input_dev *idev;
- struct i2c_client *client;
- char name[64];
- char phys[32];
- unsigned char laststate;
- unsigned char statechanged;
- unsigned long irq_handled;
- unsigned long events_sended;
- unsigned long events_processed;
- struct work_struct twi_keypad_work;
-};
-
-#define PCF8574_KP_DRV_NAME "pcf8574_keypad"
-
-static short read_state(struct twikeypad *lp)
-{
- unsigned char x, y, a, b;
-
- if (lp->client) {
- i2c_smbus_write_byte(lp->client, 240);
- x = 0xF & (~(i2c_smbus_read_byte(lp->client) >> 4));
-
- i2c_smbus_write_byte(lp->client, 15);
- y = 0xF & (~i2c_smbus_read_byte(lp->client));
-
- for (a = 0; x > 0; a++)
- x = x >> 1;
- for (b = 0; y > 0; b++)
- y = y >> 1;
-
- return (((a - 1) * 4) + b);
- }
-
- return -1;
-}
-
-static void check_and_notify(struct work_struct *work)
-{
- struct twikeypad *lp =
- container_of(work, struct twikeypad, twi_keypad_work);
- unsigned char nextstate = read_state(lp);
-
- lp->statechanged = lp->laststate ^ nextstate;
-
- if (lp->statechanged) {
- input_report_key(lp->idev,
- nextstate > 17 ? lp->btncode[lp->laststate] :
- lp->btncode[nextstate],
- nextstate > 17 ? 0 : 1);
-
- lp->events_sended++;
- }
- lp->laststate = nextstate;
- input_sync(lp->idev);
- enable_irq(lp->client->irq);
-}
-
-static irqreturn_t twi_keypad_irq_handler(int irq, void *dev_id)
-{
- struct twikeypad *lp = dev_id;
-
- disable_irq_nosync(lp->client->irq);
- schedule_work(&lp->twi_keypad_work);
-
- return IRQ_HANDLED;
-}
-
-static int pcf8574_kp_probe(struct i2c_client *client, const struct i2c_device_id *id)
-{
- int i, rc;
- struct input_dev *idev;
- struct twikeypad *lp;
-
- if (i2c_smbus_write_byte(client, 240) < 0) {
- dev_err(&client->dev, "in keypad probe: write fail\n");
- return -ENODEV;
- }
-
- lp = kzalloc(sizeof(struct twikeypad), GFP_KERNEL);
- if (!lp)
- return -ENOMEM;
- lp->client = client;
-
- i2c_set_clientdata(client, lp);
-
- if (client->irq > 0) {
- rc = request_irq(client->irq, twi_keypad_irq_handler,
- IRQF_TRIGGER_LOW, PCF8574_KP_DRV_NAME, lp);
- if (rc) {
- dev_err(&client->dev, "twikeypad: IRQ %d is not free.\n",
- client->irq);
- goto fail_irq;
- }
- } else
- dev_warn(&client->dev, "IRQ not configured!\n");
-
-
- idev = input_allocate_device();
- if (!idev) {
- dev_err(&client->dev, "Can't allocate input device\n");
- rc = -ENOMEM;
- goto fail_allocate;
- }
-
- lp->idev = idev;
- lp->btncode = twi_keypad_btncode;
-
- idev->evbit[0] = 0;
-
- idev->evbit[0] |= BIT_MASK(EV_KEY);
- idev->keycode = lp->btncode;
- idev->keycodesize = sizeof(twi_keypad_btncode);
- idev->keycodemax = ARRAY_SIZE(twi_keypad_btncode);
-
- for (i = 0; i <= ARRAY_SIZE(twi_keypad_btncode); i++)
- __set_bit(lp->btncode[i] & KEY_MAX, idev->keybit);
-
- __clear_bit(KEY_RESERVED, idev->keybit);
-
- sprintf(lp->name, "BF5xx twikeypad");
- sprintf(lp->phys, "twikeypad/input0");
-
- idev->name = lp->name;
- idev->phys = lp->phys;
- idev->id.bustype = BUS_I2C;
- idev->id.vendor = 0x0001;
- idev->id.product = 0x0001;
- idev->id.version = 0x0100;
-
- input_set_drvdata(idev, lp);
-
- rc = input_register_device(lp->idev);
- if (rc) {
- dev_err(&client->dev,
- "Failed to register TWI keypad input device!\n");
- goto fail_register;
- }
-
- lp->statechanged = 0x0;
-
- lp->laststate = read_state(lp);
-
- /* Set up our workqueue. */
- INIT_WORK(&lp->twi_keypad_work, check_and_notify);
-
- dev_info(&client->dev, "input: %s at %s IRQ %d\n", lp->name, lp->phys,
- client->irq);
-
- return 0;
-
-
-fail_register:
- input_set_drvdata(idev, NULL);
- input_free_device(idev);
-fail_allocate:
- free_irq(client->irq, lp);
-fail_irq:
- i2c_set_clientdata(client, NULL);
- kfree(lp);
-
- return rc;
-}
-
-
-
-static int __exit pcf8574_kp_remove(struct i2c_client *client)
-{
- struct twikeypad *lp = i2c_get_clientdata(client);
-
- if (client->irq > 0)
- free_irq(client->irq, lp);
-
- input_set_drvdata(lp->idev, NULL);
- input_unregister_device(lp->idev);
- kfree(lp);
-
- i2c_set_clientdata(client, NULL);
-
- return 0;
-}
-
-static int pcf8574_kp_resume(struct i2c_client *client)
-{
- struct twikeypad *lp = i2c_get_clientdata(client);
- int rc;
-
- if (client->irq > 0) {
- rc = request_irq(client->irq, twi_keypad_irq_handler,
- IRQF_TRIGGER_LOW, PCF8574_KP_DRV_NAME, lp);
- if (rc) {
- dev_err(&client->dev, "twikeypad: IRQ %d is not free.\n",
- client->irq);
- return -ENODEV;
- }
- }
- return 0;
-}
-
-static int pcf8574_kp_suspend(struct i2c_client *client, pm_message_t mesg)
-{
- struct twikeypad *lp = i2c_get_clientdata(client);
-
- if (client->irq > 0)
- free_irq(client->irq, lp);
-
- return 0;
-}
-
-static const struct i2c_device_id pcf8574_kp_id[] = {
- { PCF8574_KP_DRV_NAME, 0 },
- { }
-};
-MODULE_DEVICE_TABLE(i2c, pcf8574_kp_id);
-
-static struct i2c_driver pcf8574_kp_driver = {
- .driver = {
- .name = PCF8574_KP_DRV_NAME,
- },
- .probe = pcf8574_kp_probe,
- .remove = __exit_p(pcf8574_kp_remove),
- .suspend = pcf8574_kp_suspend,
- .resume = pcf8574_kp_resume,
- .id_table = pcf8574_kp_id,
-};
-
-static int __init twi_keypad_init(void)
-{
- return i2c_add_driver(&pcf8574_kp_driver);
-}
-
-static void __exit twi_keypad_exit(void)
-{
- i2c_del_driver(&pcf8574_kp_driver);
-}
-
-module_init(twi_keypad_init);
-module_exit(twi_keypad_exit);
