2 files changed, 5 insertions, 128 deletions
diff --git a/include/asm-avr32/intc.h b/include/asm-avr32/intc.h
deleted file mode 100644
index 1ac9ca75e8fd..000000000000
--- a/include/asm-avr32/intc.h
+++ /dev/null
@@ -1,128 +0,0 @@
-#ifndef __ASM_AVR32_INTC_H
-#define __ASM_AVR32_INTC_H
-#include <linux/sysdev.h>
-#include <linux/interrupt.h>
-struct irq_controller;
-struct irqaction;
-struct pt_regs;
-struct platform_device;
-/* Information about the internal interrupt controller */
-struct intc_device {
-        /* ioremapped address of configuration block */
-        void __iomem *regs;
-        /* the physical device */
-        struct platform_device *pdev;
-        /* Number of interrupt lines per group. */
-        unsigned int irqs_per_group;
-        /* The highest group ID + 1 */
-        unsigned int nr_groups;
-        /*
-         * Bitfield indicating which groups are actually in use.  The
-         * size of the array is
-         * ceil(group_max / (8 * sizeof(unsigned int))).
-         */
-        unsigned int group_mask[];
-};
-struct irq_controller_class {
-        /*
-         * A short name identifying this kind of controller.
-         */
-        const char *typename;
-        /*
-         * Handle the IRQ.  Must do any necessary acking and masking.
-         */
-        irqreturn_t (*handle)(int irq, void *dev_id, struct pt_regs *regs);
-        /*
-         * Register a new IRQ handler.
-         */
-        int (*setup)(struct irq_controller *ctrl, unsigned int irq,
-                     struct irqaction *action);
-        /*
-         * Unregister a IRQ handler.
-         */
-        void (*free)(struct irq_controller *ctrl, unsigned int irq,
-                     void *dev_id);
-        /*
-         * Mask the IRQ in the interrupt controller.
-         */
-        void (*mask)(struct irq_controller *ctrl, unsigned int irq);
-        /*
-         * Unmask the IRQ in the interrupt controller.
-         */
-        void (*unmask)(struct irq_controller *ctrl, unsigned int irq);
-        /*
-         * Set the type of the IRQ. See below for possible types.
-         * Return -EINVAL if a given type is not supported
-         */
-        int (*set_type)(struct irq_controller *ctrl, unsigned int irq,
-                        unsigned int type);
-        /*
-         * Return the IRQ type currently set
-         */
-        unsigned int (*get_type)(struct irq_controller *ctrl, unsigned int irq);
-};
-struct irq_controller {
-        struct irq_controller_class *class;
-        unsigned int irq_group;
-        unsigned int first_irq;
-        unsigned int nr_irqs;
-        struct list_head list;
-};
-struct intc_group_desc {
-        struct irq_controller *ctrl;
-        irqreturn_t (*handle)(int, void *, struct pt_regs *);
-        unsigned long flags;
-        void *dev_id;
-        const char *devname;
-};
-/*
- * The internal interrupt controller.  Defined in board/part-specific
- * devices.c.
- * TODO: Should probably be defined per-cpu.
- */
-extern struct intc_device intc;
-extern int request_internal_irq(unsigned int irq,
-                                irqreturn_t (*handler)(int, void *, struct pt_regs *),
-                                unsigned long irqflags,
-                                const char *devname, void *dev_id);
-extern void free_internal_irq(unsigned int irq);
-/* Only used by time_init() */
-extern int setup_internal_irq(unsigned int irq, struct intc_group_desc *desc);
-/*
- * Set interrupt priority for a given group. `group' can be found by
- * using irq_to_group(irq). Priority can be from 0 (lowest) to 3
- * (highest). Higher-priority interrupts will preempt lower-priority
- * interrupts (unless interrupts are masked globally).
- *
- * This function does not check for conflicts within a group.
- */
-extern int intc_set_priority(unsigned int group,
-                             unsigned int priority);
-/*
- * Returns a bitmask of pending interrupts in a group.
- */
-extern unsigned long intc_get_pending(unsigned int group);
-/*
- * Register a new external interrupt controller.  Returns the first
- * external IRQ number that is assigned to the new controller.
- */
-extern int intc_register_controller(struct irq_controller *ctrl);
-#endif /* __ASM_AVR32_INTC_H */
diff --git a/include/asm-avr32/irq.h b/include/asm-avr32/irq.h
index 9315724c0596..c563b7720c1a 100644
--- a/include/asm-avr32/irq.h
+++ b/include/asm-avr32/irq.h
@@ -14,6 +14,11 @@
 #ifndef __ASSEMBLER__
 int nmi_enable(void);
 void nmi_disable(void);
+/*
+ * Returns a bitmask of pending interrupts in a group.
+ */
+extern unsigned long intc_get_pending(unsigned int group);
 #endif
 #endif /* __ASM_AVR32_IOCTLS_H */

diff --git a/include/asm-avr32/intc.h b/include/asm-avr32/intc.h deleted file mode 100644 index 1ac9ca75e8fd..000000000000 --- a/include/asm-avr32/intc.h +++ /dev/null
@@ -1,128 +0,0 @@
1	#ifndef __ASM_AVR32_INTC_H
2	#define __ASM_AVR32_INTC_H
3
4	#include <linux/sysdev.h>
5	#include <linux/interrupt.h>
6
7	struct irq_controller;
8	struct irqaction;
9	struct pt_regs;
10
11	struct platform_device;
12
13	/* Information about the internal interrupt controller */
14	struct intc_device {
15	/* ioremapped address of configuration block */
16	void __iomem *regs;
17
18	/* the physical device */
19	struct platform_device *pdev;
20
21	/* Number of interrupt lines per group. */
22	unsigned int irqs_per_group;
23
24	/* The highest group ID + 1 */
25	unsigned int nr_groups;
26
27	/*
28	* Bitfield indicating which groups are actually in use. The
29	* size of the array is
30	* ceil(group_max / (8 * sizeof(unsigned int))).
31	*/
32	unsigned int group_mask[];
33	};
34
35	struct irq_controller_class {
36	/*
37	* A short name identifying this kind of controller.
38	*/
39	const char *typename;
40	/*
41	* Handle the IRQ. Must do any necessary acking and masking.
42	*/
43	irqreturn_t (handle)(int irq, void dev_id, struct pt_regs *regs);
44	/*
45	* Register a new IRQ handler.
46	*/
47	int (setup)(struct irq_controller ctrl, unsigned int irq,
48	struct irqaction *action);
49	/*
50	* Unregister a IRQ handler.
51	*/
52	void (free)(struct irq_controller ctrl, unsigned int irq,
53	void *dev_id);
54	/*
55	* Mask the IRQ in the interrupt controller.
56	*/
57	void (mask)(struct irq_controller ctrl, unsigned int irq);
58	/*
59	* Unmask the IRQ in the interrupt controller.
60	*/
61	void (unmask)(struct irq_controller ctrl, unsigned int irq);
62	/*
63	* Set the type of the IRQ. See below for possible types.
64	* Return -EINVAL if a given type is not supported
65	*/
66	int (set_type)(struct irq_controller ctrl, unsigned int irq,
67	unsigned int type);
68	/*
69	* Return the IRQ type currently set
70	*/
71	unsigned int (get_type)(struct irq_controller ctrl, unsigned int irq);
72	};
73
74	struct irq_controller {
75	struct irq_controller_class *class;
76	unsigned int irq_group;
77	unsigned int first_irq;
78	unsigned int nr_irqs;
79	struct list_head list;
80	};
81
82	struct intc_group_desc {
83	struct irq_controller *ctrl;
84	irqreturn_t (handle)(int, void , struct pt_regs *);
85	unsigned long flags;
86	void *dev_id;
87	const char *devname;
88	};
89
90	/*
91	* The internal interrupt controller. Defined in board/part-specific
92	* devices.c.
93	* TODO: Should probably be defined per-cpu.
94	*/
95	extern struct intc_device intc;
96
97	extern int request_internal_irq(unsigned int irq,
98	irqreturn_t (handler)(int, void , struct pt_regs *),
99	unsigned long irqflags,
100	const char devname, void dev_id);
101	extern void free_internal_irq(unsigned int irq);
102
103	/* Only used by time_init() */
104	extern int setup_internal_irq(unsigned int irq, struct intc_group_desc *desc);
105
106	/*
107	* Set interrupt priority for a given group. `group' can be found by
108	* using irq_to_group(irq). Priority can be from 0 (lowest) to 3
109	* (highest). Higher-priority interrupts will preempt lower-priority
110	* interrupts (unless interrupts are masked globally).
111	*
112	* This function does not check for conflicts within a group.
113	*/
114	extern int intc_set_priority(unsigned int group,
115	unsigned int priority);
116
117	/*
118	* Returns a bitmask of pending interrupts in a group.
119	*/
120	extern unsigned long intc_get_pending(unsigned int group);
121
122	/*
123	* Register a new external interrupt controller. Returns the first
124	* external IRQ number that is assigned to the new controller.
125	*/
126	extern int intc_register_controller(struct irq_controller *ctrl);
127
128	#endif /* __ASM_AVR32_INTC_H */


diff --git a/include/asm-avr32/irq.h b/include/asm-avr32/irq.h index 9315724c0596..c563b7720c1a 100644 --- a/include/asm-avr32/irq.h +++ b/include/asm-avr32/irq.h
@@ -14,6 +14,11 @@
14	#ifndef __ASSEMBLER__	14	#ifndef __ASSEMBLER__
15	int nmi_enable(void);	15	int nmi_enable(void);
16	void nmi_disable(void);	16	void nmi_disable(void);
		17
		18	/*
		19	* Returns a bitmask of pending interrupts in a group.
		20	*/
		21	extern unsigned long intc_get_pending(unsigned int group);
17	#endif	22	#endif
18		23
19	#endif /* __ASM_AVR32_IOCTLS_H */	24	#endif /* __ASM_AVR32_IOCTLS_H */