projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm: use pgdat_end_pfn() to simplify the code in others
[deliverable/linux.git]
/
drivers
/
irqchip
/
irq-bcm2835.c
diff --git
a/drivers/irqchip/irq-bcm2835.c
b/drivers/irqchip/irq-bcm2835.c
index 16c78f1c5ef25ad4121b1ee7e2b7fab30cedce95..1693b8e7f26ad83c9686af3af7273e41c5e4af04 100644
(file)
--- a/
drivers/irqchip/irq-bcm2835.c
+++ b/
drivers/irqchip/irq-bcm2835.c
@@
-49,9
+49,11
@@
#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/irqdomain.h>
#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/irqdomain.h>
-#include <linux/irqchip/bcm2835.h>
#include <asm/exception.h>
#include <asm/exception.h>
+#include <asm/mach/irq.h>
+
+#include "irqchip.h"
/* Put the bank and irq (32 bits) into the hwirq */
#define MAKE_HWIRQ(b, n) ((b << 5) | (n))
/* Put the bank and irq (32 bits) into the hwirq */
#define MAKE_HWIRQ(b, n) ((b << 5) | (n))
@@
-93,6
+95,8
@@
struct armctrl_ic {
};
static struct armctrl_ic intc __read_mostly;
};
static struct armctrl_ic intc __read_mostly;
+static asmlinkage void __exception_irq_entry bcm2835_handle_irq(
+ struct pt_regs *regs);
static void armctrl_mask_irq(struct irq_data *d)
{
static void armctrl_mask_irq(struct irq_data *d)
{
@@
-164,17
+168,9
@@
static int __init armctrl_of_init(struct device_node *node,
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
}
}
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
}
}
- return 0;
-}
-
-static struct of_device_id irq_of_match[] __initconst = {
- { .compatible = "brcm,bcm2835-armctrl-ic", .data = armctrl_of_init },
- { }
-};
-void __init bcm2835_init_irq(void)
-{
- of_irq_init(irq_of_match);
+ set_handle_irq(bcm2835_handle_irq);
+ return 0;
}
/*
}
/*
@@
-200,7
+196,7
@@
static void armctrl_handle_shortcut(int bank, struct pt_regs *regs,
handle_IRQ(irq_linear_revmap(intc.domain, irq), regs);
}
handle_IRQ(irq_linear_revmap(intc.domain, irq), regs);
}
-asmlinkage void __exception_irq_entry bcm2835_handle_irq(
+
static
asmlinkage void __exception_irq_entry bcm2835_handle_irq(
struct pt_regs *regs)
{
u32 stat, irq;
struct pt_regs *regs)
{
u32 stat, irq;
@@
-222,3
+218,5
@@
asmlinkage void __exception_irq_entry bcm2835_handle_irq(
}
}
}
}
}
}
+
+IRQCHIP_DECLARE(bcm2835_armctrl_ic, "brcm,bcm2835-armctrl-ic", armctrl_of_init);
This page took
0.023772 seconds
and
5
git commands to generate.