git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OMAP3+: OPP: Replace voltage values with Macros
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
irq.c
diff --git
a/arch/arm/mach-omap2/irq.c
b/arch/arm/mach-omap2/irq.c
index
23049c4
..
bc524b9
100644
(file)
--- a/
arch/arm/mach-omap2/irq.c
+++ b/
arch/arm/mach-omap2/irq.c
@@
-61,8
+61,6
@@
struct omap3_intc_regs {
u32 mir[INTCPS_NR_MIR_REGS];
};
u32 mir[INTCPS_NR_MIR_REGS];
};
-static struct omap3_intc_regs intc_context[ARRAY_SIZE(irq_banks)];
-
/* INTC bank register get/set */
static void intc_bank_write_reg(u32 val, struct omap_irq_bank *bank, u16 reg)
/* INTC bank register get/set */
static void intc_bank_write_reg(u32 val, struct omap_irq_bank *bank, u16 reg)
@@
-110,7
+108,7
@@
static void omap_mask_irq(struct irq_data *d)
unsigned int irq = d->irq;
int offset = irq & (~(IRQ_BITS_PER_REG - 1));
unsigned int irq = d->irq;
int offset = irq & (~(IRQ_BITS_PER_REG - 1));
- if (cpu_is_omap34xx()) {
+ if (cpu_is_omap34xx()
&& !cpu_is_ti816x()
) {
int spurious = 0;
/*
int spurious = 0;
/*
@@
-205,6
+203,9
@@
void __init omap_init_irq(void)
BUG_ON(!base);
BUG_ON(!base);
+ if (cpu_is_ti816x())
+ bank->nr_irqs = 128;
+
/* Static mapping, never released */
bank->base_reg = ioremap(base, SZ_4K);
if (!bank->base_reg) {
/* Static mapping, never released */
bank->base_reg = ioremap(base, SZ_4K);
if (!bank->base_reg) {
@@
-229,6
+230,8
@@
void __init omap_init_irq(void)
}
#ifdef CONFIG_ARCH_OMAP3
}
#ifdef CONFIG_ARCH_OMAP3
+static struct omap3_intc_regs intc_context[ARRAY_SIZE(irq_banks)];
+
void omap_intc_save_context(void)
{
int ind = 0, i = 0;
void omap_intc_save_context(void)
{
int ind = 0, i = 0;