]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
Merge commit 'v2.6.35-rc3' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 30 Jun 2010 22:07:09 +0000 (15:07 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 30 Jun 2010 22:07:09 +0000 (15:07 -0700)
28 files changed:
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-input.c
drivers/input/evdev.c
drivers/input/keyboard/adp5588-keys.c
drivers/input/keyboard/gpio_keys.c
drivers/input/keyboard/lm8323.c
drivers/input/keyboard/matrix_keypad.c
drivers/input/misc/Kconfig
drivers/input/misc/Makefile
drivers/input/misc/adxl34x-i2c.c [new file with mode: 0644]
drivers/input/misc/adxl34x-spi.c [new file with mode: 0644]
drivers/input/misc/adxl34x.c [new file with mode: 0644]
drivers/input/misc/adxl34x.h [new file with mode: 0644]
drivers/input/misc/wistron_btns.c
drivers/input/mouse/bcm5974.c
drivers/input/serio/i8042-ppcio.h
drivers/input/tablet/wacom_wac.c
drivers/input/tablet/wacom_wac.h
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/ads7846.c
drivers/input/touchscreen/tps6507x-ts.c
drivers/input/touchscreen/usbtouchscreen.c
include/linux/i2c/adp5588.h
include/linux/input.h
include/linux/input/adxl34x.h [new file with mode: 0644]
include/linux/input/matrix_keypad.h
include/linux/spi/ads7846.h

index aa0f7dcabcd78bcbee6c019d680d93cf9e400ad0..a35f8bee9659df34b2c88a3a639a293a0b022220 100644 (file)
@@ -1568,6 +1568,7 @@ static const struct hid_device_id hid_ignore_list[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC5UH) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC4UM) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0001) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0002) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0003) },
index 6af77ed0b555b595792af1c355ec2d1992559858..fad4cb03a8f263a0c371fa7f697e9c40f302fa88 100644 (file)
 
 #define USB_VENDOR_ID_ETT              0x0664
 #define USB_DEVICE_ID_TC5UH            0x0309
+#define USB_DEVICE_ID_TC4UM            0x0306
 
 #define USB_VENDOR_ID_EZKEY            0x0518
 #define USB_DEVICE_ID_BTC_8193         0x0002
index 7a0d2e4661a1244b02de5b511389fc1ea7bb68d5..69d152e16a6aa2e0a51d3945473c78f9e8c2f7c7 100644 (file)
@@ -534,6 +534,9 @@ mapped:
                        input_set_abs_params(input, usage->code, a, b, (b - a) >> 8, (b - a) >> 4);
                else    input_set_abs_params(input, usage->code, a, b, 0, 0);
 
+               /* use a larger default input buffer for MT devices */
+               if (usage->code == ABS_MT_POSITION_X && input->hint_events_per_packet == 0)
+                       input_set_events_per_packet(input, 60);
        }
 
        if (usage->type == EV_ABS &&
index 2ee6c7a68bdccf4c9cf6c330f824d341f0a69302..cd323254ca6f560a1b7d38b5283297f67f5b84ee 100644 (file)
@@ -10,7 +10,8 @@
 
 #define EVDEV_MINOR_BASE       64
 #define EVDEV_MINORS           32
-#define EVDEV_BUFFER_SIZE      64
+#define EVDEV_MIN_BUFFER_SIZE  64U
+#define EVDEV_BUF_PACKETS      8
 
 #include <linux/poll.h>
 #include <linux/sched.h>
@@ -36,13 +37,14 @@ struct evdev {
 };
 
 struct evdev_client {
-       struct input_event buffer[EVDEV_BUFFER_SIZE];
        int head;
        int tail;
        spinlock_t buffer_lock; /* protects access to buffer, head and tail */
        struct fasync_struct *fasync;
        struct evdev *evdev;
        struct list_head node;
+       int bufsize;
+       struct input_event buffer[];
 };
 
 static struct evdev *evdev_table[EVDEV_MINORS];
@@ -52,11 +54,15 @@ static void evdev_pass_event(struct evdev_client *client,
                             struct input_event *event)
 {
        /*
-        * Interrupts are disabled, just acquire the lock
+        * Interrupts are disabled, just acquire the lock.
+        * Make sure we don't leave with the client buffer
+        * "empty" by having client->head == client->tail.
         */
        spin_lock(&client->buffer_lock);
-       client->buffer[client->head++] = *event;
-       client->head &= EVDEV_BUFFER_SIZE - 1;
+       do {
+               client->buffer[client->head++] = *event;
+               client->head &= client->bufsize - 1;
+       } while (client->head == client->tail);
        spin_unlock(&client->buffer_lock);
 
        if (event->type == EV_SYN)
@@ -242,11 +248,21 @@ static int evdev_release(struct inode *inode, struct file *file)
        return 0;
 }
 
+static unsigned int evdev_compute_buffer_size(struct input_dev *dev)
+{
+       unsigned int n_events =
+               max(dev->hint_events_per_packet * EVDEV_BUF_PACKETS,
+                   EVDEV_MIN_BUFFER_SIZE);
+
+       return roundup_pow_of_two(n_events);
+}
+
 static int evdev_open(struct inode *inode, struct file *file)
 {
        struct evdev *evdev;
        struct evdev_client *client;
        int i = iminor(inode) - EVDEV_MINOR_BASE;
+       unsigned int bufsize;
        int error;
 
        if (i >= EVDEV_MINORS)
@@ -263,12 +279,17 @@ static int evdev_open(struct inode *inode, struct file *file)
        if (!evdev)
                return -ENODEV;
 
-       client = kzalloc(sizeof(struct evdev_client), GFP_KERNEL);
+       bufsize = evdev_compute_buffer_size(evdev->handle.dev);
+
+       client = kzalloc(sizeof(struct evdev_client) +
+                               bufsize * sizeof(struct input_event),
+                        GFP_KERNEL);
        if (!client) {
                error = -ENOMEM;
                goto err_put_evdev;
        }
 
+       client->bufsize = bufsize;
        spin_lock_init(&client->buffer_lock);
        client->evdev = evdev;
        evdev_attach_client(evdev, client);
@@ -334,7 +355,7 @@ static int evdev_fetch_next_event(struct evdev_client *client,
        have_event = client->head != client->tail;
        if (have_event) {
                *event = client->buffer[client->tail++];
-               client->tail &= EVDEV_BUFFER_SIZE - 1;
+               client->tail &= client->bufsize - 1;
        }
 
        spin_unlock_irq(&client->buffer_lock);
index 744600eff222935b8af076ac8122c07f22a896e9..9096db73c3c8b0e3abe8f3ad78b9f9ac29dd0db8 100644 (file)
@@ -67,6 +67,8 @@ struct adp5588_kpad {
        struct delayed_work work;
        unsigned long delay;
        unsigned short keycode[ADP5588_KEYMAPSIZE];
+       const struct adp5588_gpi_map *gpimap;
+       unsigned short gpimapsize;
 };
 
 static int adp5588_read(struct i2c_client *client, u8 reg)
@@ -84,12 +86,37 @@ static int adp5588_write(struct i2c_client *client, u8 reg, u8 val)
        return i2c_smbus_write_byte_data(client, reg, val);
 }
 
+static void adp5588_report_events(struct adp5588_kpad *kpad, int ev_cnt)
+{
+       int i, j;
+
+       for (i = 0; i < ev_cnt; i++) {
+               int key = adp5588_read(kpad->client, Key_EVENTA + i);
+               int key_val = key & KEY_EV_MASK;
+
+               if (key_val >= GPI_PIN_BASE && key_val <= GPI_PIN_END) {
+                       for (j = 0; j < kpad->gpimapsize; j++) {
+                               if (key_val == kpad->gpimap[j].pin) {
+                                       input_report_switch(kpad->input,
+                                                       kpad->gpimap[j].sw_evt,
+                                                       key & KEY_EV_PRESSED);
+                                       break;
+                               }
+                       }
+               } else {
+                       input_report_key(kpad->input,
+                                        kpad->keycode[key_val - 1],
+                                        key & KEY_EV_PRESSED);
+               }
+       }
+}
+
 static void adp5588_work(struct work_struct *work)
 {
        struct adp5588_kpad *kpad = container_of(work,
                                                struct adp5588_kpad, work.work);
        struct i2c_client *client = kpad->client;
-       int i, key, status, ev_cnt;
+       int status, ev_cnt;
 
        status = adp5588_read(client, INT_STAT);
 
@@ -99,12 +126,7 @@ static void adp5588_work(struct work_struct *work)
        if (status & KE_INT) {
                ev_cnt = adp5588_read(client, KEY_LCK_EC_STAT) & KEC;
                if (ev_cnt) {
-                       for (i = 0; i < ev_cnt; i++) {
-                               key = adp5588_read(client, Key_EVENTA + i);
-                               input_report_key(kpad->input,
-                                       kpad->keycode[(key & KEY_EV_MASK) - 1],
-                                       key & KEY_EV_PRESSED);
-                       }
+                       adp5588_report_events(kpad, ev_cnt);
                        input_sync(kpad->input);
                }
        }
@@ -130,6 +152,7 @@ static int __devinit adp5588_setup(struct i2c_client *client)
 {
        struct adp5588_kpad_platform_data *pdata = client->dev.platform_data;
        int i, ret;
+       unsigned char evt_mode1 = 0, evt_mode2 = 0, evt_mode3 = 0;
 
        ret = adp5588_write(client, KP_GPIO1, KP_SEL(pdata->rows));
        ret |= adp5588_write(client, KP_GPIO2, KP_SEL(pdata->cols) & 0xFF);
@@ -144,6 +167,23 @@ static int __devinit adp5588_setup(struct i2c_client *client)
        for (i = 0; i < KEYP_MAX_EVENT; i++)
                ret |= adp5588_read(client, Key_EVENTA);
 
+       for (i = 0; i < pdata->gpimapsize; i++) {
+               unsigned short pin = pdata->gpimap[i].pin;
+
+               if (pin <= GPI_PIN_ROW_END) {
+                       evt_mode1 |= (1 << (pin - GPI_PIN_ROW_BASE));
+               } else {
+                       evt_mode2 |= ((1 << (pin - GPI_PIN_COL_BASE)) & 0xFF);
+                       evt_mode3 |= ((1 << (pin - GPI_PIN_COL_BASE)) >> 8);
+               }
+       }
+
+       if (pdata->gpimapsize) {
+               ret |= adp5588_write(client, GPI_EM1, evt_mode1);
+               ret |= adp5588_write(client, GPI_EM2, evt_mode2);
+               ret |= adp5588_write(client, GPI_EM3, evt_mode3);
+       }
+
        ret |= adp5588_write(client, INT_STAT, CMP2_INT | CMP1_INT |
                                        OVR_FLOW_INT | K_LCK_INT |
                                        GPI_INT | KE_INT); /* Status is W1C */
@@ -158,6 +198,44 @@ static int __devinit adp5588_setup(struct i2c_client *client)
        return 0;
 }
 
+static void __devinit adp5588_report_switch_state(struct adp5588_kpad *kpad)
+{
+       int gpi_stat1 = adp5588_read(kpad->client, GPIO_DAT_STAT1);
+       int gpi_stat2 = adp5588_read(kpad->client, GPIO_DAT_STAT2);
+       int gpi_stat3 = adp5588_read(kpad->client, GPIO_DAT_STAT3);
+       int gpi_stat_tmp, pin_loc;
+       int i;
+
+       for (i = 0; i < kpad->gpimapsize; i++) {
+               unsigned short pin = kpad->gpimap[i].pin;
+
+               if (pin <= GPI_PIN_ROW_END) {
+                       gpi_stat_tmp = gpi_stat1;
+                       pin_loc = pin - GPI_PIN_ROW_BASE;
+               } else if ((pin - GPI_PIN_COL_BASE) < 8) {
+                       gpi_stat_tmp = gpi_stat2;
+                       pin_loc = pin - GPI_PIN_COL_BASE;
+               } else {
+                       gpi_stat_tmp = gpi_stat3;
+                       pin_loc = pin - GPI_PIN_COL_BASE - 8;
+               }
+
+               if (gpi_stat_tmp < 0) {
+                       dev_err(&kpad->client->dev,
+                               "Can't read GPIO_DAT_STAT switch %d default to OFF\n",
+                               pin);
+                       gpi_stat_tmp = 0;
+               }
+
+               input_report_switch(kpad->input,
+                                   kpad->gpimap[i].sw_evt,
+                                   !(gpi_stat_tmp & (1 << pin_loc)));
+       }
+
+       input_sync(kpad->input);
+}
+
+
 static int __devinit adp5588_probe(struct i2c_client *client,
                                        const struct i2c_device_id *id)
 {
@@ -189,6 +267,37 @@ static int __devinit adp5588_probe(struct i2c_client *client,
                return -EINVAL;
        }
 
+       if (!pdata->gpimap && pdata->gpimapsize) {
+               dev_err(&client->dev, "invalid gpimap from pdata\n");
+               return -EINVAL;
+       }
+
+       if (pdata->gpimapsize > ADP5588_GPIMAPSIZE_MAX) {
+               dev_err(&client->dev, "invalid gpimapsize\n");
+               return -EINVAL;
+       }
+
+       for (i = 0; i < pdata->gpimapsize; i++) {
+               unsigned short pin = pdata->gpimap[i].pin;
+
+               if (pin < GPI_PIN_BASE || pin > GPI_PIN_END) {
+                       dev_err(&client->dev, "invalid gpi pin data\n");
+                       return -EINVAL;
+               }
+
+               if (pin <= GPI_PIN_ROW_END) {
+                       if (pin - GPI_PIN_ROW_BASE + 1 <= pdata->rows) {
+                               dev_err(&client->dev, "invalid gpi row data\n");
+                               return -EINVAL;
+                       }
+               } else {
+                       if (pin - GPI_PIN_COL_BASE + 1 <= pdata->cols) {
+                               dev_err(&client->dev, "invalid gpi col data\n");
+                               return -EINVAL;
+                       }
+               }
+       }
+
        if (!client->irq) {
                dev_err(&client->dev, "no IRQ?\n");
                return -EINVAL;
@@ -233,6 +342,9 @@ static int __devinit adp5588_probe(struct i2c_client *client,
        memcpy(kpad->keycode, pdata->keymap,
                pdata->keymapsize * input->keycodesize);
 
+       kpad->gpimap = pdata->gpimap;
+       kpad->gpimapsize = pdata->gpimapsize;
+
        /* setup input device */
        __set_bit(EV_KEY, input->evbit);
 
@@ -243,6 +355,11 @@ static int __devinit adp5588_probe(struct i2c_client *client,
                __set_bit(kpad->keycode[i] & KEY_MAX, input->keybit);
        __clear_bit(KEY_RESERVED, input->keybit);
 
+       if (kpad->gpimapsize)
+               __set_bit(EV_SW, input->evbit);
+       for (i = 0; i < kpad->gpimapsize; i++)
+               __set_bit(kpad->gpimap[i].sw_evt, input->swbit);
+
        error = input_register_device(input);
        if (error) {
                dev_err(&client->dev, "unable to register input device\n");
@@ -261,6 +378,9 @@ static int __devinit adp5588_probe(struct i2c_client *client,
        if (error)
                goto err_free_irq;
 
+       if (kpad->gpimapsize)
+               adp5588_report_switch_state(kpad);
+
        device_init_wakeup(&client->dev, 1);
        i2c_set_clientdata(client, kpad);
 
index b8213fd13c3f0ab277a51ad167b7ae85ab7fcdff..a9fd147f2ba744150bae9d7f4f763b70700302c2 100644 (file)
@@ -31,6 +31,7 @@ struct gpio_button_data {
        struct input_dev *input;
        struct timer_list timer;
        struct work_struct work;
+       int timer_debounce;     /* in msecs */
        bool disabled;
 };
 
@@ -109,7 +110,7 @@ static void gpio_keys_disable_button(struct gpio_button_data *bdata)
                 * Disable IRQ and possible debouncing timer.
                 */
                disable_irq(gpio_to_irq(bdata->button->gpio));
-               if (bdata->button->debounce_interval)
+               if (bdata->timer_debounce)
                        del_timer_sync(&bdata->timer);
 
                bdata->disabled = true;
@@ -347,9 +348,9 @@ static irqreturn_t gpio_keys_isr(int irq, void *dev_id)
 
        BUG_ON(irq != gpio_to_irq(button->gpio));
 
-       if (button->debounce_interval)
+       if (bdata->timer_debounce)
                mod_timer(&bdata->timer,
-                       jiffies + msecs_to_jiffies(button->debounce_interval));
+                       jiffies + msecs_to_jiffies(bdata->timer_debounce));
        else
                schedule_work(&bdata->work);
 
@@ -383,6 +384,14 @@ static int __devinit gpio_keys_setup_key(struct platform_device *pdev,
                goto fail3;
        }
 
+       if (button->debounce_interval) {
+               error = gpio_set_debounce(button->gpio,
+                                         button->debounce_interval * 1000);
+               /* use timer if gpiolib doesn't provide debounce */
+               if (error < 0)
+                       bdata->timer_debounce = button->debounce_interval;
+       }
+
        irq = gpio_to_irq(button->gpio);
        if (irq < 0) {
                error = irq;
@@ -498,7 +507,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
  fail2:
        while (--i >= 0) {
                free_irq(gpio_to_irq(pdata->buttons[i].gpio), &ddata->data[i]);
-               if (pdata->buttons[i].debounce_interval)
+               if (ddata->data[i].timer_debounce)
                        del_timer_sync(&ddata->data[i].timer);
                cancel_work_sync(&ddata->data[i].work);
                gpio_free(pdata->buttons[i].gpio);
@@ -526,7 +535,7 @@ static int __devexit gpio_keys_remove(struct platform_device *pdev)
        for (i = 0; i < pdata->nbuttons; i++) {
                int irq = gpio_to_irq(pdata->buttons[i].gpio);
                free_irq(irq, &ddata->data[i]);
-               if (pdata->buttons[i].debounce_interval)
+               if (ddata->data[i].timer_debounce)
                        del_timer_sync(&ddata->data[i].timer);
                cancel_work_sync(&ddata->data[i].work);
                gpio_free(pdata->buttons[i].gpio);
index 40b032f0e32cd47a12e33f300810da9a131941c0..f7c2a166576b8cc161c1debb85639c8426906584 100644 (file)
@@ -642,6 +642,7 @@ static int __devinit lm8323_probe(struct i2c_client *client,
        struct lm8323_platform_data *pdata = client->dev.platform_data;
        struct input_dev *idev;
        struct lm8323_chip *lm;
+       int pwm;
        int i, err;
        unsigned long tmo;
        u8 data[2];
@@ -710,8 +711,9 @@ static int __devinit lm8323_probe(struct i2c_client *client,
                goto fail1;
        }
 
-       for (i = 0; i < LM8323_NUM_PWMS; i++) {
-               err = init_pwm(lm, i + 1, &client->dev, pdata->pwm_names[i]);
+       for (pwm = 0; pwm < LM8323_NUM_PWMS; pwm++) {
+               err = init_pwm(lm, pwm + 1, &client->dev,
+                              pdata->pwm_names[pwm]);
                if (err < 0)
                        goto fail2;
        }
@@ -764,9 +766,9 @@ fail4:
 fail3:
        device_remove_file(&client->dev, &dev_attr_disable_kp);
 fail2:
-       while (--i >= 0)
-               if (lm->pwm[i].enabled)
-                       led_classdev_unregister(&lm->pwm[i].cdev);
+       while (--pwm >= 0)
+               if (lm->pwm[pwm].enabled)
+                       led_classdev_unregister(&lm->pwm[pwm].cdev);
 fail1:
        input_free_device(idev);
        kfree(lm);
index b443e088fd3c0c09e3f103011de69b24070e720f..b02e4268e18fd743b1cb0639399655bb5236a362 100644 (file)
@@ -37,6 +37,7 @@ struct matrix_keypad {
        spinlock_t lock;
        bool scan_pending;
        bool stopped;
+       bool gpio_all_disabled;
 };
 
 /*
@@ -87,8 +88,12 @@ static void enable_row_irqs(struct matrix_keypad *keypad)
        const struct matrix_keypad_platform_data *pdata = keypad->pdata;
        int i;
 
-       for (i = 0; i < pdata->num_row_gpios; i++)
-               enable_irq(gpio_to_irq(pdata->row_gpios[i]));
+       if (pdata->clustered_irq > 0)
+               enable_irq(pdata->clustered_irq);
+       else {
+               for (i = 0; i < pdata->num_row_gpios; i++)
+                       enable_irq(gpio_to_irq(pdata->row_gpios[i]));
+       }
 }
 
 static void disable_row_irqs(struct matrix_keypad *keypad)
@@ -96,8 +101,12 @@ static void disable_row_irqs(struct matrix_keypad *keypad)
        const struct matrix_keypad_platform_data *pdata = keypad->pdata;
        int i;
 
-       for (i = 0; i < pdata->num_row_gpios; i++)
-               disable_irq_nosync(gpio_to_irq(pdata->row_gpios[i]));
+       if (pdata->clustered_irq > 0)
+               disable_irq_nosync(pdata->clustered_irq);
+       else {
+               for (i = 0; i < pdata->num_row_gpios; i++)
+                       disable_irq_nosync(gpio_to_irq(pdata->row_gpios[i]));
+       }
 }
 
 /*
@@ -216,45 +225,69 @@ static void matrix_keypad_stop(struct input_dev *dev)
 }
 
 #ifdef CONFIG_PM
-static int matrix_keypad_suspend(struct device *dev)
+static void matrix_keypad_enable_wakeup(struct matrix_keypad *keypad)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct matrix_keypad *keypad = platform_get_drvdata(pdev);
        const struct matrix_keypad_platform_data *pdata = keypad->pdata;
+       unsigned int gpio;
        int i;
 
-       matrix_keypad_stop(keypad->input_dev);
+       if (pdata->clustered_irq > 0) {
+               if (enable_irq_wake(pdata->clustered_irq) == 0)
+                       keypad->gpio_all_disabled = true;
+       } else {
 
-       if (device_may_wakeup(&pdev->dev)) {
                for (i = 0; i < pdata->num_row_gpios; i++) {
                        if (!test_bit(i, keypad->disabled_gpios)) {
-                               unsigned int gpio = pdata->row_gpios[i];
+                               gpio = pdata->row_gpios[i];
 
                                if (enable_irq_wake(gpio_to_irq(gpio)) == 0)
                                        __set_bit(i, keypad->disabled_gpios);
                        }
                }
        }
-
-       return 0;
 }
 
-static int matrix_keypad_resume(struct device *dev)
+static void matrix_keypad_disable_wakeup(struct matrix_keypad *keypad)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct matrix_keypad *keypad = platform_get_drvdata(pdev);
        const struct matrix_keypad_platform_data *pdata = keypad->pdata;
+       unsigned int gpio;
        int i;
 
-       if (device_may_wakeup(&pdev->dev)) {
+       if (pdata->clustered_irq > 0) {
+               if (keypad->gpio_all_disabled) {
+                       disable_irq_wake(pdata->clustered_irq);
+                       keypad->gpio_all_disabled = false;
+               }
+       } else {
                for (i = 0; i < pdata->num_row_gpios; i++) {
                        if (test_and_clear_bit(i, keypad->disabled_gpios)) {
-                               unsigned int gpio = pdata->row_gpios[i];
-
+                               gpio = pdata->row_gpios[i];
                                disable_irq_wake(gpio_to_irq(gpio));
                        }
                }
        }
+}
+
+static int matrix_keypad_suspend(struct device *dev)
+{
+       struct platform_device *pdev = to_platform_device(dev);
+       struct matrix_keypad *keypad = platform_get_drvdata(pdev);
+
+       matrix_keypad_stop(keypad->input_dev);
+
+       if (device_may_wakeup(&pdev->dev))
+               matrix_keypad_enable_wakeup(keypad);
+
+       return 0;
+}
+
+static int matrix_keypad_resume(struct device *dev)
+{
+       struct platform_device *pdev = to_platform_device(dev);
+       struct matrix_keypad *keypad = platform_get_drvdata(pdev);
+
+       if (device_may_wakeup(&pdev->dev))
+               matrix_keypad_disable_wakeup(keypad);
 
        matrix_keypad_start(keypad->input_dev);
 
@@ -296,17 +329,31 @@ static int __devinit init_matrix_gpio(struct platform_device *pdev,
                gpio_direction_input(pdata->row_gpios[i]);
        }
 
-       for (i = 0; i < pdata->num_row_gpios; i++) {
-               err = request_irq(gpio_to_irq(pdata->row_gpios[i]),
+       if (pdata->clustered_irq > 0) {
+               err = request_irq(pdata->clustered_irq,
                                matrix_keypad_interrupt,
-                               IRQF_DISABLED |
-                               IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+                               pdata->clustered_irq_flags,
                                "matrix-keypad", keypad);
                if (err) {
                        dev_err(&pdev->dev,
-                               "Unable to acquire interrupt for GPIO line %i\n",
-                               pdata->row_gpios[i]);
-                       goto err_free_irqs;
+                               "Unable to acquire clustered interrupt\n");
+                       goto err_free_rows;
+               }
+       } else {
+               for (i = 0; i < pdata->num_row_gpios; i++) {
+                       err = request_irq(gpio_to_irq(pdata->row_gpios[i]),
+                                       matrix_keypad_interrupt,
+                                       IRQF_DISABLED |
+                                       IRQF_TRIGGER_RISING |
+                                       IRQF_TRIGGER_FALLING,
+                                       "matrix-keypad", keypad);
+                       if (err) {
+                               dev_err(&pdev->dev,
+                                       "Unable to acquire interrupt "
+                                       "for GPIO line %i\n",
+                                       pdata->row_gpios[i]);
+                               goto err_free_irqs;
+                       }
                }
        }
 
@@ -418,11 +465,16 @@ static int __devexit matrix_keypad_remove(struct platform_device *pdev)
 
        device_init_wakeup(&pdev->dev, 0);
 
-       for (i = 0; i < pdata->num_row_gpios; i++) {
-               free_irq(gpio_to_irq(pdata->row_gpios[i]), keypad);
-               gpio_free(pdata->row_gpios[i]);
+       if (pdata->clustered_irq > 0) {
+               free_irq(pdata->clustered_irq, keypad);
+       } else {
+               for (i = 0; i < pdata->num_row_gpios; i++)
+                       free_irq(gpio_to_irq(pdata->row_gpios[i]), keypad);
        }
 
+       for (i = 0; i < pdata->num_row_gpios; i++)
+               gpio_free(pdata->row_gpios[i]);
+
        for (i = 0; i < pdata->num_col_gpios; i++)
                gpio_free(pdata->col_gpios[i]);
 
index c44b9eafc556e48c114780e0dc7ed6af1e144cda..ede6d52fe95cf37e5299609afa20428b3a1d94ac 100644 (file)
@@ -390,4 +390,41 @@ config INPUT_PCAP
          To compile this driver as a module, choose M here: the
          module will be called pcap_keys.
 
+config INPUT_ADXL34X
+       tristate "Analog Devices ADXL34x Three-Axis Digital Accelerometer"
+       default n
+       help
+         Say Y here if you have a Accelerometer interface using the
+         ADXL345/6 controller, and your board-specific initialization
+         code includes that in its table of devices.
+
+         This driver can use either I2C or SPI communication to the
+         ADXL345/6 controller.  Select the appropriate method for
+         your system.
+
+         If unsure, say N (but it's safe to say "Y").
+
+         To compile this driver as a module, choose M here: the
+         module will be called adxl34x.
+
+config INPUT_ADXL34X_I2C
+       tristate "support I2C bus connection"
+       depends on INPUT_ADXL34X && I2C
+       default y
+       help
+         Say Y here if you have ADXL345/6 hooked to an I2C bus.
+
+         To compile this driver as a module, choose M here: the
+         module will be called adxl34x-i2c.
+
+config INPUT_ADXL34X_SPI
+       tristate "support SPI bus connection"
+       depends on INPUT_ADXL34X && SPI
+       default y
+       help
+         Say Y here if you have ADXL345/6 hooked to a SPI bus.
+
+         To compile this driver as a module, choose M here: the
+         module will be called adxl34x-spi.
+
 endif
index 71fe57d8023ff834284afc91ad57fcd08c97606e..97b5dc32df19044c370dc4d10635023fc3c5a7f0 100644 (file)
@@ -8,6 +8,9 @@ obj-$(CONFIG_INPUT_88PM860X_ONKEY)      += 88pm860x_onkey.o
 obj-$(CONFIG_INPUT_AD714X)             += ad714x.o
 obj-$(CONFIG_INPUT_AD714X_I2C)         += ad714x-i2c.o
 obj-$(CONFIG_INPUT_AD714X_SPI)         += ad714x-spi.o
+obj-$(CONFIG_INPUT_ADXL34X)            += adxl34x.o
+obj-$(CONFIG_INPUT_ADXL34X_I2C)                += adxl34x-i2c.o
+obj-$(CONFIG_INPUT_ADXL34X_SPI)                += adxl34x-spi.o
 obj-$(CONFIG_INPUT_APANEL)             += apanel.o
 obj-$(CONFIG_INPUT_ATI_REMOTE)         += ati_remote.o
 obj-$(CONFIG_INPUT_ATI_REMOTE2)                += ati_remote2.o
diff --git a/drivers/input/misc/adxl34x-i2c.c b/drivers/input/misc/adxl34x-i2c.c
new file mode 100644 (file)
index 0000000..76194b5
--- /dev/null
@@ -0,0 +1,163 @@
+/*
+ * ADLX345/346 Three-Axis Digital Accelerometers (I2C Interface)
+ *
+ * Enter bugs at http://blackfin.uclinux.org/
+ *
+ * Copyright (C) 2009 Michael Hennerich, Analog Devices Inc.
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/input.h>       /* BUS_I2C */
+#include <linux/i2c.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include "adxl34x.h"
+
+static int adxl34x_smbus_read(struct device *dev, unsigned char reg)
+{
+       struct i2c_client *client = to_i2c_client(dev);
+
+       return i2c_smbus_read_byte_data(client, reg);
+}
+
+static int adxl34x_smbus_write(struct device *dev,
+                              unsigned char reg, unsigned char val)
+{
+       struct i2c_client *client = to_i2c_client(dev);
+
+       return i2c_smbus_write_byte_data(client, reg, val);
+}
+
+static int adxl34x_smbus_read_block(struct device *dev,
+                                   unsigned char reg, int count,
+                                   void *buf)
+{
+       struct i2c_client *client = to_i2c_client(dev);
+
+       return i2c_smbus_read_i2c_block_data(client, reg, count, buf);
+}
+
+static int adxl34x_i2c_read_block(struct device *dev,
+                                 unsigned char reg, int count,
+                                 void *buf)
+{
+       struct i2c_client *client = to_i2c_client(dev);
+       int ret;
+
+       ret = i2c_master_send(client, &reg, 1);
+       if (ret < 0)
+               return ret;
+
+       ret = i2c_master_recv(client, buf, count);
+       if (ret < 0)
+               return ret;
+
+       if (ret != count)
+               return -EIO;
+
+       return 0;
+}
+
+static const struct adxl34x_bus_ops adx134x_smbus_bops = {
+       .bustype        = BUS_I2C,
+       .write          = adxl34x_smbus_write,
+       .read           = adxl34x_smbus_read,
+       .read_block     = adxl34x_smbus_read_block,
+};
+
+static const struct adxl34x_bus_ops adx134x_i2c_bops = {
+       .bustype        = BUS_I2C,
+       .write          = adxl34x_smbus_write,
+       .read           = adxl34x_smbus_read,
+       .read_block     = adxl34x_i2c_read_block,
+};
+
+static int __devinit adxl34x_i2c_probe(struct i2c_client *client,
+                                      const struct i2c_device_id *id)
+{
+       struct adxl34x *ac;
+       int error;
+
+       error = i2c_check_functionality(client->adapter,
+                       I2C_FUNC_SMBUS_BYTE_DATA);
+       if (!error) {
+               dev_err(&client->dev, "SMBUS Byte Data not Supported\n");
+               return -EIO;
+       }
+
+       ac = adxl34x_probe(&client->dev, client->irq, false,
+                          i2c_check_functionality(client->adapter,
+                                                  I2C_FUNC_SMBUS_READ_I2C_BLOCK) ?
+                               &adx134x_smbus_bops : &adx134x_i2c_bops);
+       if (IS_ERR(ac))
+               return PTR_ERR(ac);
+
+       i2c_set_clientdata(client, ac);
+
+       return 0;
+}
+
+static int __devexit adxl34x_i2c_remove(struct i2c_client *client)
+{
+       struct adxl34x *ac = i2c_get_clientdata(client);
+
+       return adxl34x_remove(ac);
+}
+
+#ifdef CONFIG_PM
+static int adxl34x_suspend(struct i2c_client *client, pm_message_t message)
+{
+       struct adxl34x *ac = i2c_get_clientdata(client);
+
+       adxl34x_disable(ac);
+
+       return 0;
+}
+
+static int adxl34x_resume(struct i2c_client *client)
+{
+       struct adxl34x *ac = i2c_get_clientdata(client);
+
+       adxl34x_enable(ac);
+
+       return 0;
+}
+#else
+# define adxl34x_suspend NULL
+# define adxl34x_resume  NULL
+#endif
+
+static const struct i2c_device_id adxl34x_id[] = {
+       { "adxl34x", 0 },
+       { }
+};
+
+MODULE_DEVICE_TABLE(i2c, adxl34x_id);
+
+static struct i2c_driver adxl34x_driver = {
+       .driver = {
+               .name = "adxl34x",
+               .owner = THIS_MODULE,
+       },
+       .probe    = adxl34x_i2c_probe,
+       .remove   = __devexit_p(adxl34x_i2c_remove),
+       .suspend  = adxl34x_suspend,
+       .resume   = adxl34x_resume,
+       .id_table = adxl34x_id,
+};
+
+static int __init adxl34x_i2c_init(void)
+{
+       return i2c_add_driver(&adxl34x_driver);
+}
+module_init(adxl34x_i2c_init);
+
+static void __exit adxl34x_i2c_exit(void)
+{
+       i2c_del_driver(&adxl34x_driver);
+}
+module_exit(adxl34x_i2c_exit);
+
+MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
+MODULE_DESCRIPTION("ADXL345/346 Three-Axis Digital Accelerometer I2C Bus Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/input/misc/adxl34x-spi.c b/drivers/input/misc/adxl34x-spi.c
new file mode 100644 (file)
index 0000000..7f99235
--- /dev/null
@@ -0,0 +1,145 @@
+/*
+ * ADLX345/346 Three-Axis Digital Accelerometers (SPI Interface)
+ *
+ * Enter bugs at http://blackfin.uclinux.org/
+ *
+ * Copyright (C) 2009 Michael Hennerich, Analog Devices Inc.
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/input.h>       /* BUS_SPI */
+#include <linux/module.h>
+#include <linux/spi/spi.h>
+#include <linux/types.h>
+#include "adxl34x.h"
+
+#define MAX_SPI_FREQ_HZ                5000000
+#define MAX_FREQ_NO_FIFODELAY  1500000
+#define ADXL34X_CMD_MULTB      (1 << 6)
+#define ADXL34X_CMD_READ       (1 << 7)
+#define ADXL34X_WRITECMD(reg)  (reg & 0x3F)
+#define ADXL34X_READCMD(reg)   (ADXL34X_CMD_READ | (reg & 0x3F))
+#define ADXL34X_READMB_CMD(reg) (ADXL34X_CMD_READ | ADXL34X_CMD_MULTB \
+                                       | (reg & 0x3F))
+
+static int adxl34x_spi_read(struct device *dev, unsigned char reg)
+{
+       struct spi_device *spi = to_spi_device(dev);
+       unsigned char cmd;
+
+       cmd = ADXL34X_READCMD(reg);
+
+       return spi_w8r8(spi, cmd);
+}
+
+static int adxl34x_spi_write(struct device *dev,
+                            unsigned char reg, unsigned char val)
+{
+       struct spi_device *spi = to_spi_device(dev);
+       unsigned char buf[2];
+
+       buf[0] = ADXL34X_WRITECMD(reg);
+       buf[1] = val;
+
+       return spi_write(spi, buf, sizeof(buf));
+}
+
+static int adxl34x_spi_read_block(struct device *dev,
+                                 unsigned char reg, int count,
+                                 void *buf)
+{
+       struct spi_device *spi = to_spi_device(dev);
+       ssize_t status;
+
+       reg = ADXL34X_READMB_CMD(reg);
+       status = spi_write_then_read(spi, &reg, 1, buf, count);
+
+       return (status < 0) ? status : 0;
+}
+
+static const struct adxl34x_bus_ops adx134x_spi_bops = {
+       .bustype        = BUS_SPI,
+       .write          = adxl34x_spi_write,
+       .read           = adxl34x_spi_read,
+       .read_block     = adxl34x_spi_read_block,
+};
+
+static int __devinit adxl34x_spi_probe(struct spi_device *spi)
+{
+       struct adxl34x *ac;
+
+       /* don't exceed max specified SPI CLK frequency */
+       if (spi->max_speed_hz > MAX_SPI_FREQ_HZ) {
+               dev_err(&spi->dev, "SPI CLK %d Hz too fast\n", spi->max_speed_hz);
+               return -EINVAL;
+       }
+
+       ac = adxl34x_probe(&spi->dev, spi->irq,
+                          spi->max_speed_hz > MAX_FREQ_NO_FIFODELAY,
+                          &adx134x_spi_bops);
+
+       if (IS_ERR(ac))
+               return PTR_ERR(ac);
+
+       spi_set_drvdata(spi, ac);
+
+       return 0;
+}
+
+static int __devexit adxl34x_spi_remove(struct spi_device *spi)
+{
+       struct adxl34x *ac = dev_get_drvdata(&spi->dev);
+
+       return adxl34x_remove(ac);
+}
+
+#ifdef CONFIG_PM
+static int adxl34x_suspend(struct spi_device *spi, pm_message_t message)
+{
+       struct adxl34x *ac = dev_get_drvdata(&spi->dev);
+
+       adxl34x_disable(ac);
+
+       return 0;
+}
+
+static int adxl34x_resume(struct spi_device *spi)
+{
+       struct adxl34x *ac = dev_get_drvdata(&spi->dev);
+
+       adxl34x_enable(ac);
+
+       return 0;
+}
+#else
+# define adxl34x_suspend NULL
+# define adxl34x_resume  NULL
+#endif
+
+static struct spi_driver adxl34x_driver = {
+       .driver = {
+               .name = "adxl34x",
+               .bus = &spi_bus_type,
+               .owner = THIS_MODULE,
+       },
+       .probe   = adxl34x_spi_probe,
+       .remove  = __devexit_p(adxl34x_spi_remove),
+       .suspend = adxl34x_suspend,
+       .resume  = adxl34x_resume,
+};
+
+static int __init adxl34x_spi_init(void)
+{
+       return spi_register_driver(&adxl34x_driver);
+}
+module_init(adxl34x_spi_init);
+
+static void __exit adxl34x_spi_exit(void)
+{
+       spi_unregister_driver(&adxl34x_driver);
+}
+module_exit(adxl34x_spi_exit);
+
+MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
+MODULE_DESCRIPTION("ADXL345/346 Three-Axis Digital Accelerometer SPI Bus Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/input/misc/adxl34x.c b/drivers/input/misc/adxl34x.c
new file mode 100644 (file)
index 0000000..77fb409
--- /dev/null
@@ -0,0 +1,894 @@
+/*
+ * ADXL345/346 Three-Axis Digital Accelerometers
+ *
+ * Enter bugs at http://blackfin.uclinux.org/
+ *
+ * Copyright (C) 2009 Michael Hennerich, Analog Devices Inc.
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/device.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/slab.h>
+#include <linux/workqueue.h>
+#include <linux/input/adxl34x.h>
+
+#include "adxl34x.h"
+
+/* ADXL345/6 Register Map */
+#define DEVID          0x00    /* R   Device ID */
+#define THRESH_TAP     0x1D    /* R/W Tap threshold */
+#define OFSX           0x1E    /* R/W X-axis offset */
+#define OFSY           0x1F    /* R/W Y-axis offset */
+#define OFSZ           0x20    /* R/W Z-axis offset */
+#define DUR            0x21    /* R/W Tap duration */
+#define LATENT         0x22    /* R/W Tap latency */
+#define WINDOW         0x23    /* R/W Tap window */
+#define THRESH_ACT     0x24    /* R/W Activity threshold */
+#define THRESH_INACT   0x25    /* R/W Inactivity threshold */
+#define TIME_INACT     0x26    /* R/W Inactivity time */
+#define ACT_INACT_CTL  0x27    /* R/W Axis enable control for activity and */
+                               /* inactivity detection */
+#define THRESH_FF      0x28    /* R/W Free-fall threshold */
+#define TIME_FF                0x29    /* R/W Free-fall time */
+#define TAP_AXES       0x2A    /* R/W Axis control for tap/double tap */
+#define ACT_TAP_STATUS 0x2B    /* R   Source of tap/double tap */
+#define BW_RATE                0x2C    /* R/W Data rate and power mode control */
+#define POWER_CTL      0x2D    /* R/W Power saving features control */
+#define INT_ENABLE     0x2E    /* R/W Interrupt enable control */
+#define INT_MAP                0x2F    /* R/W Interrupt mapping control */
+#define INT_SOURCE     0x30    /* R   Source of interrupts */
+#define DATA_FORMAT    0x31    /* R/W Data format control */
+#define DATAX0         0x32    /* R   X-Axis Data 0 */
+#define DATAX1         0x33    /* R   X-Axis Data 1 */
+#define DATAY0         0x34    /* R   Y-Axis Data 0 */
+#define DATAY1         0x35    /* R   Y-Axis Data 1 */
+#define DATAZ0         0x36    /* R   Z-Axis Data 0 */
+#define DATAZ1         0x37    /* R   Z-Axis Data 1 */
+#define FIFO_CTL       0x38    /* R/W FIFO control */
+#define FIFO_STATUS    0x39    /* R   FIFO status */
+#define TAP_SIGN       0x3A    /* R   Sign and source for tap/double tap */
+/* Orientation ADXL346 only */
+#define ORIENT_CONF    0x3B    /* R/W Orientation configuration */
+#define ORIENT         0x3C    /* R   Orientation status */
+
+/* DEVIDs */
+#define ID_ADXL345     0xE5
+#define ID_ADXL346     0xE6
+
+/* INT_ENABLE/INT_MAP/INT_SOURCE Bits */
+#define DATA_READY     (1 << 7)
+#define SINGLE_TAP     (1 << 6)
+#define DOUBLE_TAP     (1 << 5)
+#define ACTIVITY       (1 << 4)
+#define INACTIVITY     (1 << 3)
+#define FREE_FALL      (1 << 2)
+#define WATERMARK      (1 << 1)
+#define OVERRUN                (1 << 0)
+
+/* ACT_INACT_CONTROL Bits */
+#define ACT_ACDC       (1 << 7)
+#define ACT_X_EN       (1 << 6)
+#define ACT_Y_EN       (1 << 5)
+#define ACT_Z_EN       (1 << 4)
+#define INACT_ACDC     (1 << 3)
+#define INACT_X_EN     (1 << 2)
+#define INACT_Y_EN     (1 << 1)
+#define INACT_Z_EN     (1 << 0)
+
+/* TAP_AXES Bits */
+#define SUPPRESS       (1 << 3)
+#define TAP_X_EN       (1 << 2)
+#define TAP_Y_EN       (1 << 1)
+#define TAP_Z_EN       (1 << 0)
+
+/* ACT_TAP_STATUS Bits */
+#define ACT_X_SRC      (1 << 6)
+#define ACT_Y_SRC      (1 << 5)
+#define ACT_Z_SRC      (1 << 4)
+#define ASLEEP         (1 << 3)
+#define TAP_X_SRC      (1 << 2)
+#define TAP_Y_SRC      (1 << 1)
+#define TAP_Z_SRC      (1 << 0)
+
+/* BW_RATE Bits */
+#define LOW_POWER      (1 << 4)
+#define RATE(x)                ((x) & 0xF)
+
+/* POWER_CTL Bits */
+#define PCTL_LINK      (1 << 5)
+#define PCTL_AUTO_SLEEP (1 << 4)
+#define PCTL_MEASURE   (1 << 3)
+#define PCTL_SLEEP     (1 << 2)
+#define PCTL_WAKEUP(x) ((x) & 0x3)
+
+/* DATA_FORMAT Bits */
+#define SELF_TEST      (1 << 7)
+#define SPI            (1 << 6)
+#define INT_INVERT     (1 << 5)
+#define FULL_RES       (1 << 3)
+#define JUSTIFY                (1 << 2)
+#define RANGE(x)       ((x) & 0x3)
+#define RANGE_PM_2g    0
+#define RANGE_PM_4g    1
+#define RANGE_PM_8g    2
+#define RANGE_PM_16g   3
+
+/*
+ * Maximum value our axis may get in full res mode for the input device
+ * (signed 13 bits)
+ */
+#define ADXL_FULLRES_MAX_VAL 4096
+
+/*
+ * Maximum value our axis may get in fixed res mode for the input device
+ * (signed 10 bits)
+ */
+#define ADXL_FIXEDRES_MAX_VAL 512
+
+/* FIFO_CTL Bits */
+#define FIFO_MODE(x)   (((x) & 0x3) << 6)
+#define FIFO_BYPASS    0
+#define FIFO_FIFO      1
+#define FIFO_STREAM    2
+#define FIFO_TRIGGER   3
+#define TRIGGER                (1 << 5)
+#define SAMPLES(x)     ((x) & 0x1F)
+
+/* FIFO_STATUS Bits */
+#define FIFO_TRIG      (1 << 7)
+#define ENTRIES(x)     ((x) & 0x3F)
+
+/* TAP_SIGN Bits ADXL346 only */
+#define XSIGN          (1 << 6)
+#define YSIGN          (1 << 5)
+#define ZSIGN          (1 << 4)
+#define XTAP           (1 << 3)
+#define YTAP           (1 << 2)
+#define ZTAP           (1 << 1)
+
+/* ORIENT_CONF ADXL346 only */
+#define ORIENT_DEADZONE(x)     (((x) & 0x7) << 4)
+#define ORIENT_DIVISOR(x)      ((x) & 0x7)
+
+/* ORIENT ADXL346 only */
+#define ADXL346_2D_VALID               (1 << 6)
+#define ADXL346_2D_ORIENT(x)           (((x) & 0x3) >> 4)
+#define ADXL346_3D_VALID               (1 << 3)
+#define ADXL346_3D_ORIENT(x)           ((x) & 0x7)
+#define ADXL346_2D_PORTRAIT_POS                0       /* +X */
+#define ADXL346_2D_PORTRAIT_NEG                1       /* -X */
+#define ADXL346_2D_LANDSCAPE_POS       2       /* +Y */
+#define ADXL346_2D_LANDSCAPE_NEG       3       /* -Y */
+
+#define ADXL346_3D_FRONT               3       /* +X */
+#define ADXL346_3D_BACK                        4       /* -X */
+#define ADXL346_3D_RIGHT               2       /* +Y */
+#define ADXL346_3D_LEFT                        5       /* -Y */
+#define ADXL346_3D_TOP                 1       /* +Z */
+#define ADXL346_3D_BOTTOM              6       /* -Z */
+
+#undef ADXL_DEBUG
+
+#define ADXL_X_AXIS                    0
+#define ADXL_Y_AXIS                    1
+#define ADXL_Z_AXIS                    2
+
+#define AC_READ(ac, reg)       ((ac)->bops->read((ac)->dev, reg))
+#define AC_WRITE(ac, reg, val) ((ac)->bops->write((ac)->dev, reg, val))
+
+struct axis_triple {
+       int x;
+       int y;
+       int z;
+};
+
+struct adxl34x {
+       struct device *dev;
+       struct input_dev *input;
+       struct mutex mutex;     /* reentrant protection for struct */
+       struct adxl34x_platform_data pdata;
+       struct axis_triple swcal;
+       struct axis_triple hwcal;
+       struct axis_triple saved;
+       char phys[32];
+       unsigned orient2d_saved;
+       unsigned orient3d_saved;
+       bool disabled;  /* P: mutex */
+       bool opened;    /* P: mutex */
+       bool fifo_delay;
+       int irq;
+       unsigned model;
+       unsigned int_mask;
+
+       const struct adxl34x_bus_ops *bops;
+};
+
+static const struct adxl34x_platform_data adxl34x_default_init = {
+       .tap_threshold = 35,
+       .tap_duration = 3,
+       .tap_latency = 20,
+       .tap_window = 20,
+       .tap_axis_control = ADXL_TAP_X_EN | ADXL_TAP_Y_EN | ADXL_TAP_Z_EN,
+       .act_axis_control = 0xFF,
+       .activity_threshold = 6,
+       .inactivity_threshold = 4,
+       .inactivity_time = 3,
+       .free_fall_threshold = 8,
+       .free_fall_time = 0x20,
+       .data_rate = 8,
+       .data_range = ADXL_FULL_RES,
+
+       .ev_type = EV_ABS,
+       .ev_code_x = ABS_X,     /* EV_REL */
+       .ev_code_y = ABS_Y,     /* EV_REL */
+       .ev_code_z = ABS_Z,     /* EV_REL */
+
+       .ev_code_tap = {BTN_TOUCH, BTN_TOUCH, BTN_TOUCH}, /* EV_KEY {x,y,z} */
+       .power_mode = ADXL_AUTO_SLEEP | ADXL_LINK,
+       .fifo_mode = FIFO_STREAM,
+       .watermark = 0,
+};
+
+static void adxl34x_get_triple(struct adxl34x *ac, struct axis_triple *axis)
+{
+       short buf[3];
+
+       ac->bops->read_block(ac->dev, DATAX0, DATAZ1 - DATAX0 + 1, buf);
+
+       mutex_lock(&ac->mutex);
+       ac->saved.x = (s16) le16_to_cpu(buf[0]);
+       axis->x = ac->saved.x;
+
+       ac->saved.y = (s16) le16_to_cpu(buf[1]);
+       axis->y = ac->saved.y;
+
+       ac->saved.z = (s16) le16_to_cpu(buf[2]);
+       axis->z = ac->saved.z;
+       mutex_unlock(&ac->mutex);
+}
+
+static void adxl34x_service_ev_fifo(struct adxl34x *ac)
+{
+       struct adxl34x_platform_data *pdata = &ac->pdata;
+       struct axis_triple axis;
+
+       adxl34x_get_triple(ac, &axis);
+
+       input_event(ac->input, pdata->ev_type, pdata->ev_code_x,
+                   axis.x - ac->swcal.x);
+       input_event(ac->input, pdata->ev_type, pdata->ev_code_y,
+                   axis.y - ac->swcal.y);
+       input_event(ac->input, pdata->ev_type, pdata->ev_code_z,
+                   axis.z - ac->swcal.z);
+}
+
+static void adxl34x_report_key_single(struct input_dev *input, int key)
+{
+       input_report_key(input, key, true);
+       input_sync(input);
+       input_report_key(input, key, false);
+}
+
+static void adxl34x_send_key_events(struct adxl34x *ac,
+               struct adxl34x_platform_data *pdata, int status, int press)
+{
+       int i;
+
+       for (i = ADXL_X_AXIS; i <= ADXL_Z_AXIS; i++) {
+               if (status & (1 << (ADXL_Z_AXIS - i)))
+                       input_report_key(ac->input,
+                                        pdata->ev_code_tap[i], press);
+       }
+}
+
+static void adxl34x_do_tap(struct adxl34x *ac,
+               struct adxl34x_platform_data *pdata, int status)
+{
+       adxl34x_send_key_events(ac, pdata, status, true);
+       input_sync(ac->input);
+       adxl34x_send_key_events(ac, pdata, status, false);
+}
+
+static irqreturn_t adxl34x_irq(int irq, void *handle)
+{
+       struct adxl34x *ac = handle;
+       struct adxl34x_platform_data *pdata = &ac->pdata;
+       int int_stat, tap_stat, samples, orient, orient_code;
+
+       /*
+        * ACT_TAP_STATUS should be read before clearing the interrupt
+        * Avoid reading ACT_TAP_STATUS in case TAP detection is disabled
+        */
+
+       if (pdata->tap_axis_control & (TAP_X_EN | TAP_Y_EN | TAP_Z_EN))
+               tap_stat = AC_READ(ac, ACT_TAP_STATUS);
+       else
+               tap_stat = 0;
+
+       int_stat = AC_READ(ac, INT_SOURCE);
+
+       if (int_stat & FREE_FALL)
+               adxl34x_report_key_single(ac->input, pdata->ev_code_ff);
+
+       if (int_stat & OVERRUN)
+               dev_dbg(ac->dev, "OVERRUN\n");
+
+       if (int_stat & (SINGLE_TAP | DOUBLE_TAP)) {
+               adxl34x_do_tap(ac, pdata, tap_stat);
+
+               if (int_stat & DOUBLE_TAP)
+                       adxl34x_do_tap(ac, pdata, tap_stat);
+       }
+
+       if (pdata->ev_code_act_inactivity) {
+               if (int_stat & ACTIVITY)
+                       input_report_key(ac->input,
+                                        pdata->ev_code_act_inactivity, 1);
+               if (int_stat & INACTIVITY)
+                       input_report_key(ac->input,
+                                        pdata->ev_code_act_inactivity, 0);
+       }
+
+       /*
+        * ORIENTATION SENSING ADXL346 only
+        */
+       if (pdata->orientation_enable) {
+               orient = AC_READ(ac, ORIENT);
+               if ((pdata->orientation_enable & ADXL_EN_ORIENTATION_2D) &&
+                   (orient & ADXL346_2D_VALID)) {
+
+                       orient_code = ADXL346_2D_ORIENT(orient);
+                       /* Report orientation only when it changes */
+                       if (ac->orient2d_saved != orient_code) {
+                               ac->orient2d_saved = orient_code;
+                               adxl34x_report_key_single(ac->input,
+                                       pdata->ev_codes_orient_2d[orient_code]);
+                       }
+               }
+
+               if ((pdata->orientation_enable & ADXL_EN_ORIENTATION_3D) &&
+                   (orient & ADXL346_3D_VALID)) {
+
+                       orient_code = ADXL346_3D_ORIENT(orient) - 1;
+                       /* Report orientation only when it changes */
+                       if (ac->orient3d_saved != orient_code) {
+                               ac->orient3d_saved = orient_code;
+                               adxl34x_report_key_single(ac->input,
+                                       pdata->ev_codes_orient_3d[orient_code]);
+                       }
+               }
+       }
+
+       if (int_stat & (DATA_READY | WATERMARK)) {
+
+               if (pdata->fifo_mode)
+                       samples = ENTRIES(AC_READ(ac, FIFO_STATUS)) + 1;
+               else
+                       samples = 1;
+
+               for (; samples > 0; samples--) {
+                       adxl34x_service_ev_fifo(ac);
+                       /*
+                        * To ensure that the FIFO has
+                        * completely popped, there must be at least 5 us between
+                        * the end of reading the data registers, signified by the
+                        * transition to register 0x38 from 0x37 or the CS pin
+                        * going high, and the start of new reads of the FIFO or
+                        * reading the FIFO_STATUS register. For SPI operation at
+                        * 1.5 MHz or lower, the register addressing portion of the
+                        * transmission is sufficient delay to ensure the FIFO has
+                        * completely popped. It is necessary for SPI operation
+                        * greater than 1.5 MHz to de-assert the CS pin to ensure a
+                        * total of 5 us, which is at most 3.4 us at 5 MHz
+                        * operation.
+                        */
+                       if (ac->fifo_delay && (samples > 1))
+                               udelay(3);
+               }
+       }
+
+       input_sync(ac->input);
+
+       return IRQ_HANDLED;
+}
+
+static void __adxl34x_disable(struct adxl34x *ac)
+{
+       if (!ac->disabled && ac->opened) {
+               /*
+                * A '0' places the ADXL34x into standby mode
+                * with minimum power consumption.
+                */
+               AC_WRITE(ac, POWER_CTL, 0);
+
+               ac->disabled = true;
+       }
+}
+
+static void __adxl34x_enable(struct adxl34x *ac)
+{
+       if (ac->disabled && ac->opened) {
+               AC_WRITE(ac, POWER_CTL, ac->pdata.power_mode | PCTL_MEASURE);
+               ac->disabled = false;
+       }
+}
+
+void adxl34x_disable(struct adxl34x *ac)
+{
+       mutex_lock(&ac->mutex);
+       __adxl34x_disable(ac);
+       mutex_unlock(&ac->mutex);
+}
+EXPORT_SYMBOL_GPL(adxl34x_disable);
+
+void adxl34x_enable(struct adxl34x *ac)
+{
+       mutex_lock(&ac->mutex);
+       __adxl34x_enable(ac);
+       mutex_unlock(&ac->mutex);
+}
+
+EXPORT_SYMBOL_GPL(adxl34x_enable);
+
+static ssize_t adxl34x_disable_show(struct device *dev,
+                                   struct device_attribute *attr, char *buf)
+{
+       struct adxl34x *ac = dev_get_drvdata(dev);
+
+       return sprintf(buf, "%u\n", ac->disabled);
+}
+
+static ssize_t adxl34x_disable_store(struct device *dev,
+                                    struct device_attribute *attr,
+                                    const char *buf, size_t count)
+{
+       struct adxl34x *ac = dev_get_drvdata(dev);
+       unsigned long val;
+       int error;
+
+       error = strict_strtoul(buf, 10, &val);
+       if (error)
+               return error;
+
+       if (val)
+               adxl34x_disable(ac);
+       else
+               adxl34x_enable(ac);
+
+       return count;
+}
+
+static DEVICE_ATTR(disable, 0664, adxl34x_disable_show, adxl34x_disable_store);
+
+static ssize_t adxl34x_calibrate_show(struct device *dev,
+                                     struct device_attribute *attr, char *buf)
+{
+       struct adxl34x *ac = dev_get_drvdata(dev);
+       ssize_t count;
+
+       mutex_lock(&ac->mutex);
+       count = sprintf(buf, "%d,%d,%d\n",
+                       ac->hwcal.x * 4 + ac->swcal.x,
+                       ac->hwcal.y * 4 + ac->swcal.y,
+                       ac->hwcal.z * 4 + ac->swcal.z);
+       mutex_unlock(&ac->mutex);
+
+       return count;
+}
+
+static ssize_t adxl34x_calibrate_store(struct device *dev,
+                                      struct device_attribute *attr,
+                                      const char *buf, size_t count)
+{
+       struct adxl34x *ac = dev_get_drvdata(dev);
+
+       /*
+        * Hardware offset calibration has a resolution of 15.6 mg/LSB.
+        * We use HW calibration and handle the remaining bits in SW. (4mg/LSB)
+        */
+
+       mutex_lock(&ac->mutex);
+       ac->hwcal.x -= (ac->saved.x / 4);
+       ac->swcal.x = ac->saved.x % 4;
+
+       ac->hwcal.y -= (ac->saved.y / 4);
+       ac->swcal.y = ac->saved.y % 4;
+
+       ac->hwcal.z -= (ac->saved.z / 4);
+       ac->swcal.z = ac->saved.z % 4;
+
+       AC_WRITE(ac, OFSX, (s8) ac->hwcal.x);
+       AC_WRITE(ac, OFSY, (s8) ac->hwcal.y);
+       AC_WRITE(ac, OFSZ, (s8) ac->hwcal.z);
+       mutex_unlock(&ac->mutex);
+
+       return count;
+}
+
+static DEVICE_ATTR(calibrate, 0664,
+                  adxl34x_calibrate_show, adxl34x_calibrate_store);
+
+static ssize_t adxl34x_rate_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+       struct adxl34x *ac = dev_get_drvdata(dev);
+
+       return sprintf(buf, "%u\n", RATE(ac->pdata.data_rate));
+}
+
+static ssize_t adxl34x_rate_store(struct device *dev,
+                                 struct device_attribute *attr,
+                                 const char *buf, size_t count)
+{
+       struct adxl34x *ac = dev_get_drvdata(dev);
+       unsigned long val;
+       int error;
+
+       error = strict_strtoul(buf, 10, &val);
+       if (error)
+               return error;
+
+       mutex_lock(&ac->mutex);
+
+       ac->pdata.data_rate = RATE(val);
+       AC_WRITE(ac, BW_RATE,
+                ac->pdata.data_rate |
+                       (ac->pdata.low_power_mode ? LOW_POWER : 0));
+
+       mutex_unlock(&ac->mutex);
+
+       return count;
+}
+
+static DEVICE_ATTR(rate, 0664, adxl34x_rate_show, adxl34x_rate_store);
+
+static ssize_t adxl34x_autosleep_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+       struct adxl34x *ac = dev_get_drvdata(dev);
+
+       return sprintf(buf, "%u\n",
+               ac->pdata.power_mode & (PCTL_AUTO_SLEEP | PCTL_LINK) ? 1 : 0);
+}
+
+static ssize_t adxl34x_autosleep_store(struct device *dev,
+                                 struct device_attribute *attr,
+                                 const char *buf, size_t count)
+{
+       struct adxl34x *ac = dev_get_drvdata(dev);
+       unsigned long val;
+       int error;
+
+       error = strict_strtoul(buf, 10, &val);
+       if (error)
+               return error;
+
+       mutex_lock(&ac->mutex);
+
+       if (val)
+               ac->pdata.power_mode |= (PCTL_AUTO_SLEEP | PCTL_LINK);
+       else
+               ac->pdata.power_mode &= ~(PCTL_AUTO_SLEEP | PCTL_LINK);
+
+       if (!ac->disabled && ac->opened)
+               AC_WRITE(ac, POWER_CTL, ac->pdata.power_mode | PCTL_MEASURE);
+
+       mutex_unlock(&ac->mutex);
+
+       return count;
+}
+
+static DEVICE_ATTR(autosleep, 0664,
+                  adxl34x_autosleep_show, adxl34x_autosleep_store);
+
+static ssize_t adxl34x_position_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+       struct adxl34x *ac = dev_get_drvdata(dev);
+       ssize_t count;
+
+       mutex_lock(&ac->mutex);
+       count = sprintf(buf, "(%d, %d, %d)\n",
+                       ac->saved.x, ac->saved.y, ac->saved.z);
+       mutex_unlock(&ac->mutex);
+
+       return count;
+}
+
+static DEVICE_ATTR(position, S_IRUGO, adxl34x_position_show, NULL);
+
+#ifdef ADXL_DEBUG
+static ssize_t adxl34x_write_store(struct device *dev,
+                                  struct device_attribute *attr,
+                                  const char *buf, size_t count)
+{
+       struct adxl34x *ac = dev_get_drvdata(dev);
+       unsigned long val;
+       int error;
+
+       /*
+        * This allows basic ADXL register write access for debug purposes.
+        */
+       error = strict_strtoul(buf, 16, &val);
+       if (error)
+               return error;
+
+       mutex_lock(&ac->mutex);
+       AC_WRITE(ac, val >> 8, val & 0xFF);
+       mutex_unlock(&ac->mutex);
+
+       return count;
+}
+
+static DEVICE_ATTR(write, 0664, NULL, adxl34x_write_store);
+#endif
+
+static struct attribute *adxl34x_attributes[] = {
+       &dev_attr_disable.attr,
+       &dev_attr_calibrate.attr,
+       &dev_attr_rate.attr,
+       &dev_attr_autosleep.attr,
+       &dev_attr_position.attr,
+#ifdef ADXL_DEBUG
+       &dev_attr_write.attr,
+#endif
+       NULL
+};
+
+static const struct attribute_group adxl34x_attr_group = {
+       .attrs = adxl34x_attributes,
+};
+
+static int adxl34x_input_open(struct input_dev *input)
+{
+       struct adxl34x *ac = input_get_drvdata(input);
+
+       mutex_lock(&ac->mutex);
+       ac->opened = true;
+       __adxl34x_enable(ac);
+       mutex_unlock(&ac->mutex);
+
+       return 0;
+}
+
+static void adxl34x_input_close(struct input_dev *input)
+{
+       struct adxl34x *ac = input_get_drvdata(input);
+
+       mutex_lock(&ac->mutex);
+       __adxl34x_disable(ac);
+       ac->opened = false;
+       mutex_unlock(&ac->mutex);
+}
+
+struct adxl34x *adxl34x_probe(struct device *dev, int irq,
+                             bool fifo_delay_default,
+                             const struct adxl34x_bus_ops *bops)
+{
+       struct adxl34x *ac;
+       struct input_dev *input_dev;
+       const struct adxl34x_platform_data *pdata;
+       int err, range, i;
+       unsigned char revid;
+
+       if (!irq) {
+               dev_err(dev, "no IRQ?\n");
+               err = -ENODEV;
+               goto err_out;
+       }
+
+       ac = kzalloc(sizeof(*ac), GFP_KERNEL);
+       input_dev = input_allocate_device();
+       if (!ac || !input_dev) {
+               err = -ENOMEM;
+               goto err_out;
+       }
+
+       ac->fifo_delay = fifo_delay_default;
+
+       pdata = dev->platform_data;
+       if (!pdata) {
+               dev_dbg(dev,
+                       "No platfrom data: Using default initialization\n");
+               pdata = &adxl34x_default_init;
+       }
+
+       ac->pdata = *pdata;
+       pdata = &ac->pdata;
+
+       ac->input = input_dev;
+       ac->disabled = true;
+       ac->dev = dev;
+       ac->irq = irq;
+       ac->bops = bops;
+
+       mutex_init(&ac->mutex);
+
+       input_dev->name = "ADXL34x accelerometer";
+       revid = ac->bops->read(dev, DEVID);
+
+       switch (revid) {
+       case ID_ADXL345:
+               ac->model = 345;
+               break;
+       case ID_ADXL346:
+               ac->model = 346;
+               break;
+       default:
+               dev_err(dev, "Failed to probe %s\n", input_dev->name);
+               err = -ENODEV;
+               goto err_free_mem;
+       }
+
+       snprintf(ac->phys, sizeof(ac->phys), "%s/input0", dev_name(dev));
+
+       input_dev->phys = ac->phys;
+       input_dev->dev.parent = dev;
+       input_dev->id.product = ac->model;
+       input_dev->id.bustype = bops->bustype;
+       input_dev->open = adxl34x_input_open;
+       input_dev->close = adxl34x_input_close;
+
+       input_set_drvdata(input_dev, ac);
+
+       __set_bit(ac->pdata.ev_type, input_dev->evbit);
+
+       if (ac->pdata.ev_type == EV_REL) {
+               __set_bit(REL_X, input_dev->relbit);
+               __set_bit(REL_Y, input_dev->relbit);
+               __set_bit(REL_Z, input_dev->relbit);
+       } else {
+               /* EV_ABS */
+               __set_bit(ABS_X, input_dev->absbit);
+               __set_bit(ABS_Y, input_dev->absbit);
+               __set_bit(ABS_Z, input_dev->absbit);
+
+               if (pdata->data_range & FULL_RES)
+                       range = ADXL_FULLRES_MAX_VAL;   /* Signed 13-bit */
+               else
+                       range = ADXL_FIXEDRES_MAX_VAL;  /* Signed 10-bit */
+
+               input_set_abs_params(input_dev, ABS_X, -range, range, 3, 3);
+               input_set_abs_params(input_dev, ABS_Y, -range, range, 3, 3);
+               input_set_abs_params(input_dev, ABS_Z, -range, range, 3, 3);
+       }
+
+       __set_bit(EV_KEY, input_dev->evbit);
+       __set_bit(pdata->ev_code_tap[ADXL_X_AXIS], input_dev->keybit);
+       __set_bit(pdata->ev_code_tap[ADXL_Y_AXIS], input_dev->keybit);
+       __set_bit(pdata->ev_code_tap[ADXL_Z_AXIS], input_dev->keybit);
+
+       if (pdata->ev_code_ff) {
+               ac->int_mask = FREE_FALL;
+               __set_bit(pdata->ev_code_ff, input_dev->keybit);
+       }
+
+       if (pdata->ev_code_act_inactivity)
+               __set_bit(pdata->ev_code_act_inactivity, input_dev->keybit);
+
+       ac->int_mask |= ACTIVITY | INACTIVITY;
+
+       if (pdata->watermark) {
+               ac->int_mask |= WATERMARK;
+               if (!FIFO_MODE(pdata->fifo_mode))
+                       ac->pdata.fifo_mode |= FIFO_STREAM;
+       } else {
+               ac->int_mask |= DATA_READY;
+       }
+
+       if (pdata->tap_axis_control & (TAP_X_EN | TAP_Y_EN | TAP_Z_EN))
+               ac->int_mask |= SINGLE_TAP | DOUBLE_TAP;
+
+       if (FIFO_MODE(pdata->fifo_mode) == FIFO_BYPASS)
+               ac->fifo_delay = false;
+
+       ac->bops->write(dev, POWER_CTL, 0);
+
+       err = request_threaded_irq(ac->irq, NULL, adxl34x_irq,
+                                  IRQF_TRIGGER_HIGH | IRQF_ONESHOT,
+                                  dev_name(dev), ac);
+       if (err) {
+               dev_err(dev, "irq %d busy?\n", ac->irq);
+               goto err_free_mem;
+       }
+
+       err = sysfs_create_group(&dev->kobj, &adxl34x_attr_group);
+       if (err)
+               goto err_free_irq;
+
+       err = input_register_device(input_dev);
+       if (err)
+               goto err_remove_attr;
+
+       AC_WRITE(ac, THRESH_TAP, pdata->tap_threshold);
+       AC_WRITE(ac, OFSX, pdata->x_axis_offset);
+       ac->hwcal.x = pdata->x_axis_offset;
+       AC_WRITE(ac, OFSY, pdata->y_axis_offset);
+       ac->hwcal.y = pdata->y_axis_offset;
+       AC_WRITE(ac, OFSZ, pdata->z_axis_offset);
+       ac->hwcal.z = pdata->z_axis_offset;
+       AC_WRITE(ac, THRESH_TAP, pdata->tap_threshold);
+       AC_WRITE(ac, DUR, pdata->tap_duration);
+       AC_WRITE(ac, LATENT, pdata->tap_latency);
+       AC_WRITE(ac, WINDOW, pdata->tap_window);
+       AC_WRITE(ac, THRESH_ACT, pdata->activity_threshold);
+       AC_WRITE(ac, THRESH_INACT, pdata->inactivity_threshold);
+       AC_WRITE(ac, TIME_INACT, pdata->inactivity_time);
+       AC_WRITE(ac, THRESH_FF, pdata->free_fall_threshold);
+       AC_WRITE(ac, TIME_FF, pdata->free_fall_time);
+       AC_WRITE(ac, TAP_AXES, pdata->tap_axis_control);
+       AC_WRITE(ac, ACT_INACT_CTL, pdata->act_axis_control);
+       AC_WRITE(ac, BW_RATE, RATE(ac->pdata.data_rate) |
+                (pdata->low_power_mode ? LOW_POWER : 0));
+       AC_WRITE(ac, DATA_FORMAT, pdata->data_range);
+       AC_WRITE(ac, FIFO_CTL, FIFO_MODE(pdata->fifo_mode) |
+                       SAMPLES(pdata->watermark));
+
+       if (pdata->use_int2) {
+               /* Map all INTs to INT2 */
+               AC_WRITE(ac, INT_MAP, ac->int_mask | OVERRUN);
+       } else {
+               /* Map all INTs to INT1 */
+               AC_WRITE(ac, INT_MAP, 0);
+       }
+
+       if (ac->model == 346 && ac->pdata.orientation_enable) {
+               AC_WRITE(ac, ORIENT_CONF,
+                       ORIENT_DEADZONE(ac->pdata.deadzone_angle) |
+                       ORIENT_DIVISOR(ac->pdata.divisor_length));
+
+               ac->orient2d_saved = 1234;
+               ac->orient3d_saved = 1234;
+
+               if (pdata->orientation_enable & ADXL_EN_ORIENTATION_3D)
+                       for (i = 0; i < ARRAY_SIZE(pdata->ev_codes_orient_3d); i++)
+                               __set_bit(pdata->ev_codes_orient_3d[i],
+                                         input_dev->keybit);
+
+               if (pdata->orientation_enable & ADXL_EN_ORIENTATION_2D)
+                       for (i = 0; i < ARRAY_SIZE(pdata->ev_codes_orient_2d); i++)
+                               __set_bit(pdata->ev_codes_orient_2d[i],
+                                         input_dev->keybit);
+       } else {
+               ac->pdata.orientation_enable = 0;
+       }
+
+       AC_WRITE(ac, INT_ENABLE, ac->int_mask | OVERRUN);
+
+       ac->pdata.power_mode &= (PCTL_AUTO_SLEEP | PCTL_LINK);
+
+       return ac;
+
+ err_remove_attr:
+       sysfs_remove_group(&dev->kobj, &adxl34x_attr_group);
+ err_free_irq:
+       free_irq(ac->irq, ac);
+ err_free_mem:
+       input_free_device(input_dev);
+       kfree(ac);
+ err_out:
+       return ERR_PTR(err);
+}
+EXPORT_SYMBOL_GPL(adxl34x_probe);
+
+int adxl34x_remove(struct adxl34x *ac)
+{
+       adxl34x_disable(ac);
+       sysfs_remove_group(&ac->dev->kobj, &adxl34x_attr_group);
+       free_irq(ac->irq, ac);
+       input_unregister_device(ac->input);
+       kfree(ac);
+
+       dev_dbg(ac->dev, "unregistered accelerometer\n");
+       return 0;
+}
+EXPORT_SYMBOL_GPL(adxl34x_remove);
+
+MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
+MODULE_DESCRIPTION("ADXL345/346 Three-Axis Digital Accelerometer Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/input/misc/adxl34x.h b/drivers/input/misc/adxl34x.h
new file mode 100644 (file)
index 0000000..ea9093c
--- /dev/null
@@ -0,0 +1,30 @@
+/*
+ * ADXL345/346 Three-Axis Digital Accelerometers (I2C/SPI Interface)
+ *
+ * Enter bugs at http://blackfin.uclinux.org/
+ *
+ * Copyright (C) 2009 Michael Hennerich, Analog Devices Inc.
+ * Licensed under the GPL-2 or later.
+ */
+
+#ifndef _ADXL34X_H_
+#define _ADXL34X_H_
+
+struct device;
+struct adxl34x;
+
+struct adxl34x_bus_ops {
+       u16 bustype;
+       int (*read)(struct device *, unsigned char);
+       int (*read_block)(struct device *, unsigned char, int, void *);
+       int (*write)(struct device *, unsigned char, unsigned char);
+};
+
+void adxl34x_disable(struct adxl34x *ac);
+void adxl34x_enable(struct adxl34x *ac);
+struct adxl34x *adxl34x_probe(struct device *dev, int irq,
+                             bool fifo_delay_default,
+                             const struct adxl34x_bus_ops *bops);
+int adxl34x_remove(struct adxl34x *ac);
+
+#endif
index 4dac8b79fcd4fc50ad1908ce3ae368cdd56085ed..12501de0c5cd36bbcc425abd84f0276607d5cbf9 100644 (file)
@@ -1347,7 +1347,7 @@ static int __init wb_module_init(void)
 
        err = map_bios();
        if (err)
-               return err;
+               goto err_free_keymap;
 
        err = platform_driver_register(&wistron_driver);
        if (err)
@@ -1371,6 +1371,8 @@ static int __init wb_module_init(void)
        platform_driver_unregister(&wistron_driver);
  err_unmap_bios:
        unmap_bios();
+ err_free_keymap:
+       kfree(keymap);
 
        return err;
 }
index 6dedded272228131c4a047fa43c0f667215e5370..ea67c49146a3a03280ee8719c362c41d8033c743 100644 (file)
@@ -312,6 +312,8 @@ static void setup_events_to_report(struct input_dev *input_dev,
        __set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit);
        __set_bit(BTN_TOOL_QUADTAP, input_dev->keybit);
        __set_bit(BTN_LEFT, input_dev->keybit);
+
+       input_set_events_per_packet(input_dev, 60);
 }
 
 /* report button data as logical button state */
@@ -580,23 +582,30 @@ exit:
  */
 static int bcm5974_start_traffic(struct bcm5974 *dev)
 {
-       if (bcm5974_wellspring_mode(dev, true)) {
+       int error;
+
+       error = bcm5974_wellspring_mode(dev, true);
+       if (error) {
                dprintk(1, "bcm5974: mode switch failed\n");
-               goto error;
+               goto err_out;
        }
 
-       if (usb_submit_urb(dev->bt_urb, GFP_KERNEL))
-               goto error;
+       error = usb_submit_urb(dev->bt_urb, GFP_KERNEL);
+       if (error)
+               goto err_reset_mode;
 
-       if (usb_submit_urb(dev->tp_urb, GFP_KERNEL))
+       error = usb_submit_urb(dev->tp_urb, GFP_KERNEL);
+       if (error)
                goto err_kill_bt;
 
        return 0;
 
 err_kill_bt:
        usb_kill_urb(dev->bt_urb);
-error:
-       return -EIO;
+err_reset_mode:
+       bcm5974_wellspring_mode(dev, false);
+err_out:
+       return error;
 }
 
 static void bcm5974_pause_traffic(struct bcm5974 *dev)
index 2906e1b60c04009a4d16ffb743ecf4f436bb7237..f708c75d16f1d919f4e054c94437fb6e4e587866 100644 (file)
@@ -52,81 +52,6 @@ static inline void i8042_platform_exit(void)
 {
 }
 
-#elif defined(CONFIG_SPRUCE)
-
-#define I8042_KBD_IRQ 22
-#define I8042_AUX_IRQ 21
-
-#define I8042_KBD_PHYS_DESC "spruceps2/serio0"
-#define I8042_AUX_PHYS_DESC "spruceps2/serio1"
-#define I8042_MUX_PHYS_DESC "spruceps2/serio%d"
-
-#define I8042_COMMAND_REG 0xff810000
-#define I8042_DATA_REG 0xff810001
-
-static inline int i8042_read_data(void)
-{
-       unsigned long kbd_data;
-
-       __raw_writel(0x00000088, 0xff500008);
-       eieio();
-
-       __raw_writel(0x03000000, 0xff50000c);
-       eieio();
-
-       asm volatile("lis     7,0xff88        \n\
-                     lswi    6,7,0x8         \n\
-                     mr      %0,6"
-                     : "=r" (kbd_data) :: "6", "7");
-
-       __raw_writel(0x00000000, 0xff50000c);
-       eieio();
-
-       return (unsigned char)(kbd_data >> 24);
-}
-
-static inline int i8042_read_status(void)
-{
-       unsigned long kbd_status;
-
-       __raw_writel(0x00000088, 0xff500008);
-       eieio();
-
-       __raw_writel(0x03000000, 0xff50000c);
-       eieio();
-
-       asm volatile("lis     7,0xff88        \n\
-                     ori     7,7,0x8         \n\
-                     lswi    6,7,0x8         \n\
-                     mr      %0,6"
-                     : "=r" (kbd_status) :: "6", "7");
-
-       __raw_writel(0x00000000, 0xff50000c);
-       eieio();
-
-       return (unsigned char)(kbd_status >> 24);
-}
-
-static inline void i8042_write_data(int val)
-{
-       *((unsigned char *)0xff810000) = (char)val;
-}
-
-static inline void i8042_write_command(int val)
-{
-       *((unsigned char *)0xff810001) = (char)val;
-}
-
-static inline int i8042_platform_init(void)
-{
-       i8042_reset = 1;
-       return 0;
-}
-
-static inline void i8042_platform_exit(void)
-{
-}
-
 #else
 
 #include "i8042-io.h"
index d564af58175cbf9136040745205b5716714b5604..555ef26e206d5df870ed7f45f8c2c4cd8ded6977 100644 (file)
@@ -158,6 +158,39 @@ static int wacom_ptu_irq(struct wacom_wac *wacom)
        return 1;
 }
 
+static int wacom_dtu_irq(struct wacom_wac *wacom)
+{
+       struct wacom_features *features = &wacom->features;
+       char *data = wacom->data;
+       struct input_dev *input = wacom->input;
+       int prox = data[1] & 0x20, pressure;
+
+       dbg("wacom_dtu_irq: received report #%d", data[0]);
+
+       if (prox) {
+               /* Going into proximity select tool */
+               wacom->tool[0] = (data[1] & 0x0c) ? BTN_TOOL_RUBBER : BTN_TOOL_PEN;
+               if (wacom->tool[0] == BTN_TOOL_PEN)
+                       wacom->id[0] = STYLUS_DEVICE_ID;
+               else
+                       wacom->id[0] = ERASER_DEVICE_ID;
+       }
+       input_report_key(input, BTN_STYLUS, data[1] & 0x02);
+       input_report_key(input, BTN_STYLUS2, data[1] & 0x10);
+       input_report_abs(input, ABS_X, le16_to_cpup((__le16 *)&data[2]));
+       input_report_abs(input, ABS_Y, le16_to_cpup((__le16 *)&data[4]));
+       pressure = ((data[7] & 0x01) << 8) | data[6];
+       if (pressure < 0)
+               pressure = features->pressure_max + pressure + 1;
+       input_report_abs(input, ABS_PRESSURE, pressure);
+       input_report_key(input, BTN_TOUCH, data[1] & 0x05);
+       if (!prox) /* out-prox */
+               wacom->id[0] = 0;
+       input_report_key(input, wacom->tool[0], prox);
+       input_report_abs(input, ABS_MISC, wacom->id[0]);
+       return 1;
+}
+
 static int wacom_graphire_irq(struct wacom_wac *wacom)
 {
        struct wacom_features *features = &wacom->features;
@@ -844,6 +877,10 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len)
                sync = wacom_ptu_irq(wacom_wac);
                break;
 
+       case DTU:
+               sync = wacom_dtu_irq(wacom_wac);
+               break;
+
        case INTUOS:
        case INTUOS3S:
        case INTUOS3:
@@ -1029,6 +1066,7 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,
 
        case PL:
        case PTU:
+       case DTU:
                __set_bit(BTN_TOOL_PEN, input_dev->keybit);
                __set_bit(BTN_STYLUS, input_dev->keybit);
                __set_bit(BTN_STYLUS2, input_dev->keybit);
@@ -1154,6 +1192,10 @@ static const struct wacom_features wacom_features_0xC6 =
        { "Wacom Cintiq 12WX",    WACOM_PKGLEN_INTUOS,    53020, 33440, 1023, 63, WACOM_BEE };
 static const struct wacom_features wacom_features_0xC7 =
        { "Wacom DTU1931",        WACOM_PKGLEN_GRAPHIRE,  37832, 30305,  511,  0, PL };
+static const struct wacom_features wacom_features_0xCE =
+       { "Wacom DTU2231",        WACOM_PKGLEN_GRAPHIRE,  47864, 27011,  511,  0, DTU };
+static const struct wacom_features wacom_features_0xF0 =
+       { "Wacom DTU1631",        WACOM_PKGLEN_GRAPHIRE,  34623, 19553,  511,  0, DTU };
 static const struct wacom_features wacom_features_0xCC =
        { "Wacom Cintiq 21UX2",   WACOM_PKGLEN_INTUOS,    87200, 65600, 2047, 63, WACOM_21UX2 };
 static const struct wacom_features wacom_features_0x90 =
@@ -1233,6 +1275,8 @@ const struct usb_device_id wacom_ids[] = {
        { USB_DEVICE_WACOM(0xC5) },
        { USB_DEVICE_WACOM(0xC6) },
        { USB_DEVICE_WACOM(0xC7) },
+       { USB_DEVICE_WACOM(0xCE) },
+       { USB_DEVICE_WACOM(0xF0) },
        { USB_DEVICE_WACOM(0xCC) },
        { USB_DEVICE_WACOM(0x90) },
        { USB_DEVICE_WACOM(0x93) },
index 854b92092dfcb8663f29bf601adc62d40ce71d1d..99e1a54cd305fa3dce303670f44973dd82d273f9 100644 (file)
@@ -43,6 +43,7 @@ enum {
        WACOM_G4,
        PTU,
        PL,
+       DTU,
        INTUOS,
        INTUOS3S,
        INTUOS3,
index 3b9d5e2105d76d9fbfdd1a8d4cab9bf80f411b25..e835f04bc0d030987b18872313e69b15a5108db4 100644 (file)
@@ -540,9 +540,9 @@ config TOUCHSCREEN_USB_ZYTRONIC
        bool "Zytronic controller" if EMBEDDED
        depends on TOUCHSCREEN_USB_COMPOSITE
 
-config TOUCHSCREEN_USB_ETT_TC5UH
+config TOUCHSCREEN_USB_ETT_TC45USB
        default y
-       bool "ET&T TC5UH touchscreen controler support" if EMBEDDED
+       bool "ET&T USB series TC4UM/TC5UH touchscreen controler support" if EMBEDDED
        depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_NEXIO
index a9fdf55c0238b14b4c6fa54fa257002f925d3daa..69210cb56c543c808bb15dffdb62cbb651009d03 100644 (file)
@@ -1174,7 +1174,10 @@ static int __devinit ads7846_probe(struct spi_device *spi)
                goto err_put_regulator;
        }
 
-       if (request_irq(spi->irq, ads7846_irq, IRQF_TRIGGER_FALLING,
+       if (!pdata->irq_flags)
+               pdata->irq_flags = IRQF_TRIGGER_FALLING;
+
+       if (request_irq(spi->irq, ads7846_irq, pdata->irq_flags,
                        spi->dev.driver->name, ts)) {
                dev_info(&spi->dev,
                        "trying pin change workaround on irq %d\n", spi->irq);
index 5b70a1419b4d6da36fe5486b5b732d647691bdff..a644d18c04dce09862663004217864698948fef0 100644 (file)
@@ -355,9 +355,6 @@ static int __devexit tps6507x_ts_remove(struct platform_device *pdev)
        struct tps6507x_ts *tsc = tps6507x_dev->ts;
        struct input_dev *input_dev = tsc->input_dev;
 
-       if (!tsc)
-               return 0;
-
        cancel_delayed_work_sync(&tsc->work);
        destroy_workqueue(tsc->wq);
 
index 567d57215c28e14bbe78621d1add3b2d1204ff2f..b9cee2738adba80d8d878a01b7727379dd15831a 100644 (file)
@@ -135,7 +135,7 @@ enum {
        DEVTYPE_JASTEC,
        DEVTYPE_E2I,
        DEVTYPE_ZYTRONIC,
-       DEVTYPE_TC5UH,
+       DEVTYPE_TC45USB,
        DEVTYPE_NEXIO,
 };
 
@@ -222,8 +222,11 @@ static const struct usb_device_id usbtouch_devices[] = {
        {USB_DEVICE(0x14c8, 0x0003), .driver_info = DEVTYPE_ZYTRONIC},
 #endif
 
-#ifdef CONFIG_TOUCHSCREEN_USB_ETT_TC5UH
-       {USB_DEVICE(0x0664, 0x0309), .driver_info = DEVTYPE_TC5UH},
+#ifdef CONFIG_TOUCHSCREEN_USB_ETT_TC45USB
+       /* TC5UH */
+       {USB_DEVICE(0x0664, 0x0309), .driver_info = DEVTYPE_TC45USB},
+       /* TC4UM */
+       {USB_DEVICE(0x0664, 0x0306), .driver_info = DEVTYPE_TC45USB},
 #endif
 
 #ifdef CONFIG_TOUCHSCREEN_USB_NEXIO
@@ -574,10 +577,10 @@ static int irtouch_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
 #endif
 
 /*****************************************************************************
- * ET&T TC5UH part
+ * ET&T TC5UH/TC4UM part
  */
-#ifdef CONFIG_TOUCHSCREEN_USB_ETT_TC5UH
-static int tc5uh_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
+#ifdef CONFIG_TOUCHSCREEN_USB_ETT_TC45USB
+static int tc45usb_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
 {
        dev->x = ((pkt[2] & 0x0F) << 8) | pkt[1];
        dev->y = ((pkt[4] & 0x0F) << 8) | pkt[3];
@@ -849,29 +852,32 @@ static void nexio_exit(struct usbtouch_usb *usbtouch)
 
 static int nexio_read_data(struct usbtouch_usb *usbtouch, unsigned char *pkt)
 {
-       int x, y, begin_x, begin_y, end_x, end_y, w, h, ret;
        struct nexio_touch_packet *packet = (void *) pkt;
        struct nexio_priv *priv = usbtouch->priv;
+       unsigned int data_len = be16_to_cpu(packet->data_len);
+       unsigned int x_len = be16_to_cpu(packet->x_len);
+       unsigned int y_len = be16_to_cpu(packet->y_len);
+       int x, y, begin_x, begin_y, end_x, end_y, w, h, ret;
 
        /* got touch data? */
        if ((pkt[0] & 0xe0) != 0xe0)
                return 0;
 
-       if (be16_to_cpu(packet->data_len) > 0xff)
-               packet->data_len = cpu_to_be16(be16_to_cpu(packet->data_len) - 0x100);
-       if (be16_to_cpu(packet->x_len) > 0xff)
-               packet->x_len = cpu_to_be16(be16_to_cpu(packet->x_len) - 0x80);
+       if (data_len > 0xff)
+               data_len -= 0x100;
+       if (x_len > 0xff)
+               x_len -= 0x80;
 
        /* send ACK */
        ret = usb_submit_urb(priv->ack, GFP_ATOMIC);
 
        if (!usbtouch->type->max_xc) {
-               usbtouch->type->max_xc = 2 * be16_to_cpu(packet->x_len);
-               input_set_abs_params(usbtouch->input, ABS_X, 0,
-                                    2 * be16_to_cpu(packet->x_len), 0, 0);
-               usbtouch->type->max_yc = 2 * be16_to_cpu(packet->y_len);
-               input_set_abs_params(usbtouch->input, ABS_Y, 0,
-                                    2 * be16_to_cpu(packet->y_len), 0, 0);
+               usbtouch->type->max_xc = 2 * x_len;
+               input_set_abs_params(usbtouch->input, ABS_X,
+                                    0, usbtouch->type->max_xc, 0, 0);
+               usbtouch->type->max_yc = 2 * y_len;
+               input_set_abs_params(usbtouch->input, ABS_Y,
+                                    0, usbtouch->type->max_yc, 0, 0);
        }
        /*
         * The device reports state of IR sensors on X and Y axes.
@@ -881,22 +887,21 @@ static int nexio_read_data(struct usbtouch_usb *usbtouch, unsigned char *pkt)
         * it's disabled (and untested) here as there's no X driver for that.
         */
        begin_x = end_x = begin_y = end_y = -1;
-       for (x = 0; x < be16_to_cpu(packet->x_len); x++) {
+       for (x = 0; x < x_len; x++) {
                if (begin_x == -1 && packet->data[x] > NEXIO_THRESHOLD) {
                        begin_x = x;
                        continue;
                }
                if (end_x == -1 && begin_x != -1 && packet->data[x] < NEXIO_THRESHOLD) {
                        end_x = x - 1;
-                       for (y = be16_to_cpu(packet->x_len);
-                            y < be16_to_cpu(packet->data_len); y++) {
+                       for (y = x_len; y < data_len; y++) {
                                if (begin_y == -1 && packet->data[y] > NEXIO_THRESHOLD) {
-                                       begin_y = y - be16_to_cpu(packet->x_len);
+                                       begin_y = y - x_len;
                                        continue;
                                }
                                if (end_y == -1 &&
                                    begin_y != -1 && packet->data[y] < NEXIO_THRESHOLD) {
-                                       end_y = y - 1 - be16_to_cpu(packet->x_len);
+                                       end_y = y - 1 - x_len;
                                        w = end_x - begin_x;
                                        h = end_y - begin_y;
 #if 0
@@ -1104,14 +1109,14 @@ static struct usbtouch_device_info usbtouch_dev_info[] = {
        },
 #endif
 
-#ifdef CONFIG_TOUCHSCREEN_USB_ETT_TC5UH
-       [DEVTYPE_TC5UH] = {
+#ifdef CONFIG_TOUCHSCREEN_USB_ETT_TC45USB
+       [DEVTYPE_TC45USB] = {
                .min_xc         = 0x0,
                .max_xc         = 0x0fff,
                .min_yc         = 0x0,
                .max_yc         = 0x0fff,
                .rept_size      = 5,
-               .read_data      = tc5uh_read_data,
+               .read_data      = tc45usb_read_data,
        },
 #endif
 
index 02c9af374741835efb1feaa1cd0c4f7bcc7e80dd..b5f57c498e24d871f2a6a51ac49e9fd88ae7aa89 100644 (file)
 
 #define ADP5588_KEYMAPSIZE     80
 
+#define GPI_PIN_ROW0 97
+#define GPI_PIN_ROW1 98
+#define GPI_PIN_ROW2 99
+#define GPI_PIN_ROW3 100
+#define GPI_PIN_ROW4 101
+#define GPI_PIN_ROW5 102
+#define GPI_PIN_ROW6 103
+#define GPI_PIN_ROW7 104
+#define GPI_PIN_COL0 105
+#define GPI_PIN_COL1 106
+#define GPI_PIN_COL2 107
+#define GPI_PIN_COL3 108
+#define GPI_PIN_COL4 109
+#define GPI_PIN_COL5 110
+#define GPI_PIN_COL6 111
+#define GPI_PIN_COL7 112
+#define GPI_PIN_COL8 113
+#define GPI_PIN_COL9 114
+
+#define GPI_PIN_ROW_BASE GPI_PIN_ROW0
+#define GPI_PIN_ROW_END GPI_PIN_ROW7
+#define GPI_PIN_COL_BASE GPI_PIN_COL0
+#define GPI_PIN_COL_END GPI_PIN_COL9
+
+#define GPI_PIN_BASE GPI_PIN_ROW_BASE
+#define GPI_PIN_END GPI_PIN_COL_END
+
+#define ADP5588_GPIMAPSIZE_MAX (GPI_PIN_END - GPI_PIN_BASE + 1)
+
+struct adp5588_gpi_map {
+       unsigned short pin;
+       unsigned short sw_evt;
+};
+
 struct adp5588_kpad_platform_data {
        int rows;                       /* Number of rows */
        int cols;                       /* Number of columns */
@@ -87,6 +121,8 @@ struct adp5588_kpad_platform_data {
        unsigned en_keylock:1;          /* Enable Key Lock feature */
        unsigned short unlock_key1;     /* Unlock Key 1 */
        unsigned short unlock_key2;     /* Unlock Key 2 */
+       const struct adp5588_gpi_map *gpimap;
+       unsigned short gpimapsize;
 };
 
 struct adp5588_gpio_platform_data {
index 6fcc9101beeb3e907b9b4c030fef7db9b7f9e334..cc524c8b6703967e657bcc4faae554e9f88df6bd 100644 (file)
@@ -1063,6 +1063,10 @@ struct ff_effect {
  * @sndbit: bitmap of sound effects supported by the device
  * @ffbit: bitmap of force feedback effects supported by the device
  * @swbit: bitmap of switches present on the device
+ * @hint_events_per_packet: average number of events generated by the
+ *     device in a packet (between EV_SYN/SYN_REPORT events). Used by
+ *     event handlers to estimate size of the buffer needed to hold
+ *     events.
  * @keycodemax: size of keycode table
  * @keycodesize: size of elements in keycode table
  * @keycode: map of scancodes to keycodes for this device
@@ -1140,6 +1144,8 @@ struct input_dev {
        unsigned long ffbit[BITS_TO_LONGS(FF_CNT)];
        unsigned long swbit[BITS_TO_LONGS(SW_CNT)];
 
+       unsigned int hint_events_per_packet;
+
        unsigned int keycodemax;
        unsigned int keycodesize;
        void *keycode;
@@ -1408,6 +1414,21 @@ static inline void input_mt_sync(struct input_dev *dev)
 
 void input_set_capability(struct input_dev *dev, unsigned int type, unsigned int code);
 
+/**
+ * input_set_events_per_packet - tell handlers about the driver event rate
+ * @dev: the input device used by the driver
+ * @n_events: the average number of events between calls to input_sync()
+ *
+ * If the event rate sent from a device is unusually large, use this
+ * function to set the expected event rate. This will allow handlers
+ * to set up an appropriate buffer size for the event stream, in order
+ * to minimize information loss.
+ */
+static inline void input_set_events_per_packet(struct input_dev *dev, int n_events)
+{
+       dev->hint_events_per_packet = n_events;
+}
+
 static inline void input_set_abs_params(struct input_dev *dev, int axis, int min, int max, int fuzz, int flat)
 {
        dev->absmin[axis] = min;
diff --git a/include/linux/input/adxl34x.h b/include/linux/input/adxl34x.h
new file mode 100644 (file)
index 0000000..df00d99
--- /dev/null
@@ -0,0 +1,349 @@
+/*
+ * include/linux/input/adxl34x.h
+ *
+ * Digital Accelerometer characteristics are highly application specific
+ * and may vary between boards and models. The platform_data for the
+ * device's "struct device" holds this information.
+ *
+ * Copyright 2009 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#ifndef __LINUX_INPUT_ADXL34X_H__
+#define __LINUX_INPUT_ADXL34X_H__
+
+struct adxl34x_platform_data {
+
+       /*
+        * X,Y,Z Axis Offset:
+        * offer user offset adjustments in twoscompliment
+        * form with a scale factor of 15.6 mg/LSB (i.e. 0x7F = +2 g)
+        */
+
+       s8 x_axis_offset;
+       s8 y_axis_offset;
+       s8 z_axis_offset;
+
+       /*
+        * TAP_X/Y/Z Enable: Setting TAP_X, Y, or Z Enable enables X,
+        * Y, or Z participation in Tap detection. A '0' excludes the
+        * selected axis from participation in Tap detection.
+        * Setting the SUPPRESS bit suppresses Double Tap detection if
+        * acceleration greater than tap_threshold is present between
+        * taps.
+        */
+
+#define ADXL_SUPPRESS  (1 << 3)
+#define ADXL_TAP_X_EN  (1 << 2)
+#define ADXL_TAP_Y_EN  (1 << 1)
+#define ADXL_TAP_Z_EN  (1 << 0)
+
+       u8 tap_axis_control;
+
+       /*
+        * tap_threshold:
+        * holds the threshold value for tap detection/interrupts.
+        * The data format is unsigned. The scale factor is 62.5 mg/LSB
+        * (i.e. 0xFF = +16 g). A zero value may result in undesirable
+        * behavior if Tap/Double Tap is enabled.
+        */
+
+       u8 tap_threshold;
+
+       /*
+        * tap_duration:
+        * is an unsigned time value representing the maximum
+        * time that an event must be above the tap_threshold threshold
+        * to qualify as a tap event. The scale factor is 625 us/LSB. A zero
+        * value will prevent Tap/Double Tap functions from working.
+        */
+
+       u8 tap_duration;
+
+       /*
+        * tap_latency:
+        * is an unsigned time value representing the wait time
+        * from the detection of a tap event to the opening of the time
+        * window tap_window for a possible second tap event. The scale
+        * factor is 1.25 ms/LSB. A zero value will disable the Double Tap
+        * function.
+        */
+
+       u8 tap_latency;
+
+       /*
+        * tap_window:
+        * is an unsigned time value representing the amount
+        * of time after the expiration of tap_latency during which a second
+        * tap can begin. The scale factor is 1.25 ms/LSB. A zero value will
+        * disable the Double Tap function.
+        */
+
+       u8 tap_window;
+
+       /*
+        * act_axis_control:
+        * X/Y/Z Enable: A '1' enables X, Y, or Z participation in activity
+        * or inactivity detection. A '0' excludes the selected axis from
+        * participation. If all of the axes are excluded, the function is
+        * disabled.
+        * AC/DC: A '0' = DC coupled operation and a '1' = AC coupled
+        * operation. In DC coupled operation, the current acceleration is
+        * compared with activity_threshold and inactivity_threshold directly
+        * to determine whether activity or inactivity is detected. In AC
+        * coupled operation for activity detection, the acceleration value
+        * at the start of activity detection is taken as a reference value.
+        * New samples of acceleration are then compared to this
+        * reference value and if the magnitude of the difference exceeds
+        * activity_threshold the device will trigger an activity interrupt. In
+        * AC coupled operation for inactivity detection, a reference value
+        * is used again for comparison and is updated whenever the
+        * device exceeds the inactivity threshold. Once the reference
+        * value is selected, the device compares the magnitude of the
+        * difference between the reference value and the current
+        * acceleration with inactivity_threshold. If the difference is below
+        * inactivity_threshold for a total of inactivity_time, the device is
+        * considered inactive and the inactivity interrupt is triggered.
+        */
+
+#define ADXL_ACT_ACDC          (1 << 7)
+#define ADXL_ACT_X_EN          (1 << 6)
+#define ADXL_ACT_Y_EN          (1 << 5)
+#define ADXL_ACT_Z_EN          (1 << 4)
+#define ADXL_INACT_ACDC                (1 << 3)
+#define ADXL_INACT_X_EN                (1 << 2)
+#define ADXL_INACT_Y_EN                (1 << 1)
+#define ADXL_INACT_Z_EN                (1 << 0)
+
+       u8 act_axis_control;
+
+       /*
+        * activity_threshold:
+        * holds the threshold value for activity detection.
+        * The data format is unsigned. The scale factor is
+        * 62.5 mg/LSB. A zero value may result in undesirable behavior if
+        * Activity interrupt is enabled.
+        */
+
+       u8 activity_threshold;
+
+       /*
+        * inactivity_threshold:
+        * holds the threshold value for inactivity
+        * detection. The data format is unsigned. The scale
+        * factor is 62.5 mg/LSB. A zero value may result in undesirable
+        * behavior if Inactivity interrupt is enabled.
+        */
+
+       u8 inactivity_threshold;
+
+       /*
+        * inactivity_time:
+        * is an unsigned time value representing the
+        * amount of time that acceleration must be below the value in
+        * inactivity_threshold for inactivity to be declared. The scale factor
+        * is 1 second/LSB. Unlike the other interrupt functions, which
+        * operate on unfiltered data, the inactivity function operates on the
+        * filtered output data. At least one output sample must be
+        * generated for the inactivity interrupt to be triggered. This will
+        * result in the function appearing un-responsive if the
+        * inactivity_time register is set with a value less than the time
+        * constant of the Output Data Rate. A zero value will result in an
+        * interrupt when the output data is below inactivity_threshold.
+        */
+
+       u8 inactivity_time;
+
+       /*
+        * free_fall_threshold:
+        * holds the threshold value for Free-Fall detection.
+        * The data format is unsigned. The root-sum-square(RSS) value
+        * of all axes is calculated and compared to the value in
+        * free_fall_threshold to determine if a free fall event may be
+        * occurring.  The scale factor is 62.5 mg/LSB. A zero value may
+        * result in undesirable behavior if Free-Fall interrupt is
+        * enabled. Values between 300 and 600 mg (0x05 to 0x09) are
+        * recommended.
+        */
+
+       u8 free_fall_threshold;
+
+       /*
+        * free_fall_time:
+        * is an unsigned time value representing the minimum
+        * time that the RSS value of all axes must be less than
+        * free_fall_threshold to generate a Free-Fall interrupt. The
+        * scale factor is 5 ms/LSB. A zero value may result in
+        * undesirable behavior if Free-Fall interrupt is enabled.
+        * Values between 100 to 350 ms (0x14 to 0x46) are recommended.
+        */
+
+       u8 free_fall_time;
+
+       /*
+        * data_rate:
+        * Selects device bandwidth and output data rate.
+        * RATE = 3200 Hz / (2^(15 - x)). Default value is 0x0A, or 100 Hz
+        * Output Data Rate. An Output Data Rate should be selected that
+        * is appropriate for the communication protocol and frequency
+        * selected. Selecting too high of an Output Data Rate with a low
+        * communication speed will result in samples being discarded.
+        */
+
+       u8 data_rate;
+
+       /*
+        * data_range:
+        * FULL_RES: When this bit is set with the device is
+        * in Full-Resolution Mode, where the output resolution increases
+        * with RANGE to maintain a 4 mg/LSB scale factor. When this
+        * bit is cleared the device is in 10-bit Mode and RANGE determine the
+        * maximum g-Range and scale factor.
+        */
+
+#define ADXL_FULL_RES          (1 << 3)
+#define ADXL_RANGE_PM_2g       0
+#define ADXL_RANGE_PM_4g       1
+#define ADXL_RANGE_PM_8g       2
+#define ADXL_RANGE_PM_16g      3
+
+       u8 data_range;
+
+       /*
+        * low_power_mode:
+        * A '0' = Normal operation and a '1' = Reduced
+        * power operation with somewhat higher noise.
+        */
+
+       u8 low_power_mode;
+
+       /*
+        * power_mode:
+        * LINK: A '1' with both the activity and inactivity functions
+        * enabled will delay the start of the activity function until
+        * inactivity is detected. Once activity is detected, inactivity
+        * detection will begin and prevent the detection of activity. This
+        * bit serially links the activity and inactivity functions. When '0'
+        * the inactivity and activity functions are concurrent. Additional
+        * information can be found in the Application section under Link
+        * Mode.
+        * AUTO_SLEEP: A '1' sets the ADXL34x to switch to Sleep Mode
+        * when inactivity (acceleration has been below inactivity_threshold
+        * for at least inactivity_time) is detected and the LINK bit is set.
+        * A '0' disables automatic switching to Sleep Mode. See SLEEP
+        * for further description.
+        */
+
+#define ADXL_LINK      (1 << 5)
+#define ADXL_AUTO_SLEEP        (1 << 4)
+
+       u8 power_mode;
+
+       /*
+        * fifo_mode:
+        * BYPASS The FIFO is bypassed
+        * FIFO   FIFO collects up to 32 values then stops collecting data
+        * STREAM FIFO holds the last 32 data values. Once full, the FIFO's
+        *        oldest data is lost as it is replaced with newer data
+        *
+        * DEFAULT should be ADXL_FIFO_STREAM
+        */
+
+#define ADXL_FIFO_BYPASS       0
+#define ADXL_FIFO_FIFO         1
+#define ADXL_FIFO_STREAM       2
+
+       u8 fifo_mode;
+
+       /*
+        * watermark:
+        * The Watermark feature can be used to reduce the interrupt load
+        * of the system. The FIFO fills up to the value stored in watermark
+        * [1..32] and then generates an interrupt.
+        * A '0' disables the watermark feature.
+        */
+
+       u8 watermark;
+
+       u32 ev_type;    /* EV_ABS or EV_REL */
+
+       u32 ev_code_x;  /* ABS_X,Y,Z or REL_X,Y,Z */
+       u32 ev_code_y;  /* ABS_X,Y,Z or REL_X,Y,Z */
+       u32 ev_code_z;  /* ABS_X,Y,Z or REL_X,Y,Z */
+
+       /*
+        * A valid BTN or KEY Code; use tap_axis_control to disable
+        * event reporting
+        */
+
+       u32 ev_code_tap[3];     /* EV_KEY {X-Axis, Y-Axis, Z-Axis} */
+
+       /*
+        * A valid BTN or KEY Code for Free-Fall or Activity enables
+        * input event reporting. A '0' disables the Free-Fall or
+        * Activity reporting.
+        */
+
+       u32 ev_code_ff; /* EV_KEY */
+       u32 ev_code_act_inactivity;     /* EV_KEY */
+
+       /*
+        * Use ADXL34x INT2 instead of INT1
+        */
+       u8 use_int2;
+
+       /*
+        * ADXL346 only ORIENTATION SENSING feature
+        * The orientation function of the ADXL346 reports both 2-D and
+        * 3-D orientation concurrently.
+        */
+
+#define ADXL_EN_ORIENTATION_2D         1
+#define ADXL_EN_ORIENTATION_3D         2
+#define ADXL_EN_ORIENTATION_2D_3D      3
+
+       u8 orientation_enable;
+
+       /*
+        * The width of the deadzone region between two or more
+        * orientation positions is determined by setting the Deadzone
+        * value. The deadzone region size can be specified with a
+        * resolution of 3.6deg. The deadzone angle represents the total
+        * angle where the orientation is considered invalid.
+        */
+
+#define ADXL_DEADZONE_ANGLE_0p0                0       /* !!!0.0 [deg] */
+#define ADXL_DEADZONE_ANGLE_3p6                1       /* 3.6 [deg] */
+#define ADXL_DEADZONE_ANGLE_7p2                2       /* 7.2 [deg] */
+#define ADXL_DEADZONE_ANGLE_10p8       3       /* 10.8 [deg] */
+#define ADXL_DEADZONE_ANGLE_14p4       4       /* 14.4 [deg] */
+#define ADXL_DEADZONE_ANGLE_18p0       5       /* 18.0 [deg] */
+#define ADXL_DEADZONE_ANGLE_21p6       6       /* 21.6 [deg] */
+#define ADXL_DEADZONE_ANGLE_25p2       7       /* 25.2 [deg] */
+
+       u8 deadzone_angle;
+
+       /*
+        * To eliminate most human motion such as walking or shaking,
+        * a Divisor value should be selected to effectively limit the
+        * orientation bandwidth. Set the depth of the filter used to
+        * low-pass filter the measured acceleration for stable
+        * orientation sensing
+        */
+
+#define ADXL_LP_FILTER_DIVISOR_2       0
+#define ADXL_LP_FILTER_DIVISOR_4       1
+#define ADXL_LP_FILTER_DIVISOR_8       2
+#define ADXL_LP_FILTER_DIVISOR_16      3
+#define ADXL_LP_FILTER_DIVISOR_32      4
+#define ADXL_LP_FILTER_DIVISOR_64      5
+#define ADXL_LP_FILTER_DIVISOR_128     6
+#define ADXL_LP_FILTER_DIVISOR_256     7
+
+       u8 divisor_length;
+
+       u32 ev_codes_orient_2d[4];      /* EV_KEY {+X, -X, +Y, -Y} */
+       u32 ev_codes_orient_3d[6];      /* EV_KEY {+Z, +Y, +X, -X, -Y, -Z} */
+};
+#endif
index c964cd7f436a4ecf63d6f2080d280734f5a2a4ca..80352ad6581a70f6ea699048f055a528b111ef18 100644 (file)
@@ -41,6 +41,9 @@ struct matrix_keymap_data {
  * @col_scan_delay_us: delay, measured in microseconds, that is
  *     needed before we can keypad after activating column gpio
  * @debounce_ms: debounce interval in milliseconds
+ * @clustered_irq: may be specified if interrupts of all row/column GPIOs
+ *     are bundled to one single irq
+ * @clustered_irq_flags: flags that are needed for the clustered irq
  * @active_low: gpio polarity
  * @wakeup: controls whether the device should be set up as wakeup
  *     source
@@ -63,6 +66,9 @@ struct matrix_keypad_platform_data {
        /* key debounce interval in milli-second */
        unsigned int    debounce_ms;
 
+       unsigned int    clustered_irq;
+       unsigned int    clustered_irq_flags;
+
        bool            active_low;
        bool            wakeup;
        bool            no_autorepeat;
index b4ae570d3c9876b090a4446f42a7ccc5c001c189..95d36bfb34bcaeed1daeae296a5e7a8c5701735d 100644 (file)
@@ -54,5 +54,6 @@ struct ads7846_platform_data {
        void    (*filter_cleanup)(void *filter_data);
        void    (*wait_for_sync)(void);
        bool    wakeup;
+       unsigned long irq_flags;
 };