sh: intc: Split up the INTC code.

[net-next-2.6.git] / include / linux / sh_intc.h

diff --git a/include/linux/sh_intc.h b/include/linux/sh_intc.h
index 0d6cd38e673ddb2486711517047a3c7fd544ad14..b4f183a31f130c6d183c60043964dc0caf74737c 100644 (file)
--- a/include/linux/sh_intc.h
+++ b/include/linux/sh_intc.h
@@ -20,6 +20,12 @@ struct intc_group {
 
 #define INTC_GROUP(enum_id, ids...) { enum_id, { ids } }
 
+struct intc_subgroup {
+       unsigned long reg, reg_width;
+       intc_enum parent_id;
+       intc_enum enum_ids[32];
+};
+
 struct intc_mask_reg {
        unsigned long set_reg, clr_reg, reg_width;
        intc_enum enum_ids[32];
@@ -69,9 +75,12 @@ struct intc_hw_desc {
        unsigned int nr_sense_regs;
        struct intc_mask_reg *ack_regs;
        unsigned int nr_ack_regs;
+       struct intc_subgroup *subgroups;
+       unsigned int nr_subgroups;
 };
 
-#define _INTC_ARRAY(a) a, sizeof(a)/sizeof(*a)
+#define _INTC_ARRAY(a) a, a == NULL ? 0 : sizeof(a)/sizeof(*a)
+
 #define INTC_HW_DESC(vectors, groups, mask_regs,       \
                     prio_regs, sense_regs, ack_regs)   \
 {                                                      \
@@ -105,8 +114,11 @@ struct intc_desc symbol __initdata = {                                     \
                           prio_regs, sense_regs, ack_regs),            \
 }
 
-int __init register_intc_controller(struct intc_desc *desc);
+int register_intc_controller(struct intc_desc *desc);
+void reserve_intc_vectors(struct intc_vect *vectors, unsigned int nr_vecs);
 int intc_set_priority(unsigned int irq, unsigned int prio);
+int intc_irq_lookup(const char *chipname, intc_enum enum_id);
+void intc_finalize(void);
 
 #ifdef CONFIG_INTC_USERIMASK
 int register_intc_userimask(unsigned long addr);