← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to arch/arm/mach-omap1/board-osk.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/mach-omap1/board-osk.c
276
276
                return;
277
277
        }
278
278
        /* the CF I/O IRQ is really active-low */
279
 
        set_irq_type(gpio_to_irq(62), IRQ_TYPE_EDGE_FALLING);
 
279
        irq_set_irq_type(gpio_to_irq(62), IRQ_TYPE_EDGE_FALLING);
280
280
}
281
281
 
282
282
static void __init osk_init_irq(void)
482
482
        omap_cfg_reg(P20_1610_GPIO4);   /* PENIRQ */
483
483
        gpio_request(4, "ts_int");
484
484
        gpio_direction_input(4);
485
 
        set_irq_type(gpio_to_irq(4), IRQ_TYPE_EDGE_FALLING);
 
485
        irq_set_irq_type(gpio_to_irq(4), IRQ_TYPE_EDGE_FALLING);
486
486
 
487
487
        spi_register_board_info(mistral_boardinfo,
488
488
                        ARRAY_SIZE(mistral_boardinfo));
500
500
                int irq = gpio_to_irq(OMAP_MPUIO(2));
501
501
 
502
502
                gpio_direction_input(OMAP_MPUIO(2));
503
 
                set_irq_type(irq, IRQ_TYPE_EDGE_RISING);
 
503
                irq_set_irq_type(irq, IRQ_TYPE_EDGE_RISING);
504
504
#ifdef  CONFIG_PM
505
505
                /* share the IRQ in case someone wants to use the
506
506
                 * button for more than wakeup from system sleep.