← 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-pxa/balloon3.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-pxa/balloon3.c
15
15
 
16
16
#include <linux/init.h>
17
17
#include <linux/platform_device.h>
18
 
#include <linux/sysdev.h>
19
18
#include <linux/interrupt.h>
20
19
#include <linux/sched.h>
21
20
#include <linux/bitops.h>
27
26
#include <linux/mtd/partitions.h>
28
27
#include <linux/types.h>
29
28
#include <linux/i2c/pcf857x.h>
 
29
#include <linux/i2c/pxa-i2c.h>
30
30
#include <linux/mtd/nand.h>
31
31
#include <linux/mtd/physmap.h>
32
32
#include <linux/regulator/max1586.h>
51
51
#include <mach/irda.h>
52
52
#include <mach/ohci.h>
53
53
 
54
 
#include <plat/i2c.h>
55
 
 
56
54
#include "generic.h"
57
55
#include "devices.h"
58
56
 
264
262
        }
265
263
 
266
264
        balloon3_lcd_screen.pxafb_backlight_power = balloon3_backlight_power;
267
 
        set_pxa_fb_info(&balloon3_lcd_screen);
 
265
        pxa_set_fb_info(NULL, &balloon3_lcd_screen);
268
266
        return;
269
267
 
270
268
err2:
528
526
        pxa27x_init_irq();
529
527
        /* setup extra Balloon3 irqs */
530
528
        for (irq = BALLOON3_IRQ(0); irq <= BALLOON3_IRQ(7); irq++) {
531
 
                set_irq_chip(irq, &balloon3_irq_chip);
532
 
                set_irq_handler(irq, handle_level_irq);
 
529
                irq_set_chip_and_handler(irq, &balloon3_irq_chip,
 
530
                                         handle_level_irq);
533
531
                set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
534
532
        }
535
533
 
536
 
        set_irq_chained_handler(BALLOON3_AUX_NIRQ, balloon3_irq_handler);
537
 
        set_irq_type(BALLOON3_AUX_NIRQ, IRQ_TYPE_EDGE_FALLING);
 
534
        irq_set_chained_handler(BALLOON3_AUX_NIRQ, balloon3_irq_handler);
 
535
        irq_set_irq_type(BALLOON3_AUX_NIRQ, IRQ_TYPE_EDGE_FALLING);
538
536
 
539
537
        pr_debug("%s: chained handler installed - irq %d automatically "
540
538
                "enabled\n", __func__, BALLOON3_AUX_NIRQ);