← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to drivers/input/keyboard/omap-keypad.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/input/keyboard/omap-keypad.c
61
61
        unsigned int cols;
62
62
        unsigned long delay;
63
63
        unsigned int debounce;
 
64
        unsigned short keymap[];
64
65
};
65
66
 
66
67
static DECLARE_TASKLET_DISABLED(kp_tasklet, omap_kp_tasklet, 0);
316
317
        if (!cpu_is_omap24xx())
317
318
                omap_writew(1, OMAP1_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
318
319
 
319
 
        input_dev->keycode      = &omap_kp[1];
320
 
        input_dev->keycodesize  = sizeof(unsigned short);
321
 
        input_dev->keycodemax   = keycodemax;
322
 
 
323
 
        if (pdata->rep)
324
 
                __set_bit(EV_REP, input_dev->evbit);
325
 
 
326
320
        if (pdata->delay)
327
321
                omap_kp->delay = pdata->delay;
328
322
 
371
365
                goto err2;
372
366
 
373
367
        /* setup input device */
374
 
        __set_bit(EV_KEY, input_dev->evbit);
375
 
        matrix_keypad_build_keymap(pdata->keymap_data, row_shift,
376
 
                        input_dev->keycode, input_dev->keybit);
377
368
        input_dev->name = "omap-keypad";
378
369
        input_dev->phys = "omap-keypad/input0";
379
370
        input_dev->dev.parent = &pdev->dev;
383
374
        input_dev->id.product = 0x0001;
384
375
        input_dev->id.version = 0x0100;
385
376
 
 
377
        if (pdata->rep)
 
378
                __set_bit(EV_REP, input_dev->evbit);
 
379
 
 
380
        ret = matrix_keypad_build_keymap(pdata->keymap_data, NULL,
 
381
                                         pdata->rows, pdata->cols,
 
382
                                         omap_kp->keymap, input_dev);
 
383
        if (ret < 0)
 
384
                goto err3;
 
385
 
386
386
        ret = input_register_device(omap_kp->input);
387
387
        if (ret < 0) {
388
388
                printk(KERN_ERR "Unable to register omap-keypad input device\n");