← Back to branch summary

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

« back to all changes in this revision

Viewing changes to arch/arm/mach-lpc32xx/irq.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Ubuntu: 3.2.0-19.31, Ubuntu: 3.2.0-19.30
  • Date: 2012-03-21 15:23:51 UTC
  • Revision ID: package-import@ubuntu.com-20120321152351-ya52awpl9cmqlwrs
Tags: 3.2.0-1410.13
https://launchpad.net/bugs/959749
https://launchpad.net/bugs/598251
https://launchpad.net/bugs/959749
https://launchpad.net/bugs/959959
https://launchpad.net/bugs/499557
https://launchpad.net/bugs/952035
https://launchpad.net/bugs/899244
https://launchpad.net/bugs/899244
https://launchpad.net/bugs/872044
https://launchpad.net/bugs/917842
https://launchpad.net/bugs/917842
[ Paolo Pisati ]

* rebased on Ubuntu-3.2.0-19.31

[ Ubuntu: 3.2.0-19.31 ]

* d-i: Add dm-multipath and scsi device handlers
  - LP: #959749
* d-i: Move multipath modules into their own udeb
  - LP: #598251, #959749
* [Config] Auto-detect do_tools setting
* [Config] correctly specify CROSS_COMPILE for tools build
* [Config] CONFIG_DRM_PSB_CDV=n
* Rebase to v3.2.12
* powerpc/pmac: Fix SMP kernels on pre-core99 UP machines
  - LP: #959959
* rebase to v3.2.12

[ Ubuntu: 3.2.0-19.30 ]

* [Config] Fix typeo in the Hyper-V module names
* [Config] Move kernels to "Section: kernel"
  - LP: #499557
* SAUCE: AppArmor: Add ability to load extended policy
* SAUCE: AppArmor: Add the ability to mediate mount
* SAUCE: AppArmor: Add profile introspection file to interface
* SAUCE: AppArmor: basic networking rules
* [Config] Disable CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER
  - LP: #952035
* Rebase to v3.2.10
* [Config] Update configs after rebase to v3.2.10
* Rebase to v3.2.11
* [Config] Disable CONFIG_STUB_POULSBO
  - LP: #899244
* [Config] Add CONFIG_DRM_PSB check to enforcer
  - LP: #899244
* [Config] Drop non-SMP powerpc
* net/hyperv: Use the built-in macro KBUILD_MODNAME for this driver
* x86: Derandom delay_tsc for 64 bit
* Bluetooth: Fix l2cap conn failures for ssp devices
  - LP: #872044
* KVM: x86: extend "struct x86_emulate_ops" with "get_cpuid"
  - LP: #917842
  - CVE-2012-0045
* KVM: x86: fix missing checks in syscall emulation
  - LP: #917842
  - CVE-2012-0045
* rebase to v3.2.11
* rebase to v3.2.10

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/mach-lpc32xx/irq.c
118
118
                .event_group = &lpc32xx_event_pin_regs,
119
119
                .mask = LPC32XX_CLKPWR_EXTSRC_GPI_06_BIT,
120
120
        },
 
121
        [IRQ_LPC32XX_GPI_28] = {
 
122
                .event_group = &lpc32xx_event_pin_regs,
 
123
                .mask = LPC32XX_CLKPWR_EXTSRC_GPI_28_BIT,
 
124
        },
121
125
        [IRQ_LPC32XX_GPIO_00] = {
122
126
                .event_group = &lpc32xx_event_int_regs,
123
127
                .mask = LPC32XX_CLKPWR_INTSRC_GPIO_00_BIT,
305
309
 
306
310
                if (state)
307
311
                        eventreg |= lpc32xx_events[d->irq].mask;
308
 
                else
 
312
                else {
309
313
                        eventreg &= ~lpc32xx_events[d->irq].mask;
310
314
 
 
315
                        /*
 
316
                         * When disabling the wakeup, clear the latched
 
317
                         * event
 
318
                         */
 
319
                        __raw_writel(lpc32xx_events[d->irq].mask,
 
320
                                lpc32xx_events[d->irq].
 
321
                                event_group->rawstat_reg);
 
322
                }
 
323
 
311
324
                __raw_writel(eventreg,
312
325
                        lpc32xx_events[d->irq].event_group->enab_reg);
313
326
 
380
393
 
381
394
        /* Setup SIC1 */
382
395
        __raw_writel(0, LPC32XX_INTC_MASK(LPC32XX_SIC1_BASE));
383
 
        __raw_writel(MIC_APR_DEFAULT, LPC32XX_INTC_POLAR(LPC32XX_SIC1_BASE));
384
 
        __raw_writel(MIC_ATR_DEFAULT, LPC32XX_INTC_ACT_TYPE(LPC32XX_SIC1_BASE));
 
396
        __raw_writel(SIC1_APR_DEFAULT, LPC32XX_INTC_POLAR(LPC32XX_SIC1_BASE));
 
397
        __raw_writel(SIC1_ATR_DEFAULT,
 
398
                                LPC32XX_INTC_ACT_TYPE(LPC32XX_SIC1_BASE));
385
399
 
386
400
        /* Setup SIC2 */
387
401
        __raw_writel(0, LPC32XX_INTC_MASK(LPC32XX_SIC2_BASE));
388
 
        __raw_writel(MIC_APR_DEFAULT, LPC32XX_INTC_POLAR(LPC32XX_SIC2_BASE));
389
 
        __raw_writel(MIC_ATR_DEFAULT, LPC32XX_INTC_ACT_TYPE(LPC32XX_SIC2_BASE));
 
402
        __raw_writel(SIC2_APR_DEFAULT, LPC32XX_INTC_POLAR(LPC32XX_SIC2_BASE));
 
403
        __raw_writel(SIC2_ATR_DEFAULT,
 
404
                                LPC32XX_INTC_ACT_TYPE(LPC32XX_SIC2_BASE));
390
405
 
391
406
        /* Configure supported IRQ's */
392
407
        for (i = 0; i < NR_IRQS; i++) {