← 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-ixp2000/core.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-ixp2000/core.c
476
476
         */
477
477
        for (irq = IRQ_IXP2000_SOFT_INT; irq <= IRQ_IXP2000_THDB3; irq++) {
478
478
                if ((1 << irq) & IXP2000_VALID_IRQ_MASK) {
479
 
                        set_irq_chip(irq, &ixp2000_irq_chip);
480
 
                        set_irq_handler(irq, handle_level_irq);
 
479
                        irq_set_chip_and_handler(irq, &ixp2000_irq_chip,
 
480
                                                 handle_level_irq);
481
481
                        set_irq_flags(irq, IRQF_VALID);
482
482
                } else set_irq_flags(irq, 0);
483
483
        }
485
485
        for (irq = IRQ_IXP2000_DRAM0_MIN_ERR; irq <= IRQ_IXP2000_SP_INT; irq++) {
486
486
                if((1 << (irq - IRQ_IXP2000_DRAM0_MIN_ERR)) &
487
487
                                IXP2000_VALID_ERR_IRQ_MASK) {
488
 
                        set_irq_chip(irq, &ixp2000_err_irq_chip);
489
 
                        set_irq_handler(irq, handle_level_irq);
 
488
                        irq_set_chip_and_handler(irq, &ixp2000_err_irq_chip,
 
489
                                                 handle_level_irq);
490
490
                        set_irq_flags(irq, IRQF_VALID);
491
491
                }
492
492
                else
493
493
                        set_irq_flags(irq, 0);
494
494
        }
495
 
        set_irq_chained_handler(IRQ_IXP2000_ERRSUM, ixp2000_err_irq_handler);
 
495
        irq_set_chained_handler(IRQ_IXP2000_ERRSUM, ixp2000_err_irq_handler);
496
496
 
497
497
        for (irq = IRQ_IXP2000_GPIO0; irq <= IRQ_IXP2000_GPIO7; irq++) {
498
 
                set_irq_chip(irq, &ixp2000_GPIO_irq_chip);
499
 
                set_irq_handler(irq, handle_level_irq);
 
498
                irq_set_chip_and_handler(irq, &ixp2000_GPIO_irq_chip,
 
499
                                         handle_level_irq);
500
500
                set_irq_flags(irq, IRQF_VALID);
501
501
        }
502
 
        set_irq_chained_handler(IRQ_IXP2000_GPIO, ixp2000_GPIO_irq_handler);
 
502
        irq_set_chained_handler(IRQ_IXP2000_GPIO, ixp2000_GPIO_irq_handler);
503
503
 
504
504
        /*
505
505
         * Enable PCI irqs.  The actual PCI[AB] decoding is done in
508
508
         */
509
509
        ixp2000_reg_write(IXP2000_IRQ_ENABLE_SET, (1 << IRQ_IXP2000_PCI));
510
510
        for (irq = IRQ_IXP2000_PCIA; irq <= IRQ_IXP2000_PCIB; irq++) {
511
 
                set_irq_chip(irq, &ixp2000_pci_irq_chip);
512
 
                set_irq_handler(irq, handle_level_irq);
 
511
                irq_set_chip_and_handler(irq, &ixp2000_pci_irq_chip,
 
512
                                         handle_level_irq);
513
513
                set_irq_flags(irq, IRQF_VALID);
514
514
        }
515
515
}