mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
m68knommu: generic irq handling
Change the m68knommu irq handling to use the generic irq framework. Signed-off-by: Greg Ungerer <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Greg Ungerer
Linus Torvalds
parent
f8af0bb890
commit
2502b667ea
17 changed files with 172 additions and 779 deletions
|
|
@ -1,7 +1,5 @@
|
|||
#ifndef _M68K_IRQ_H_
|
||||
#define _M68K_IRQ_H_
|
||||
|
||||
#include <asm/ptrace.h>
|
||||
#ifndef _M68KNOMMU_IRQ_H_
|
||||
#define _M68KNOMMU_IRQ_H_
|
||||
|
||||
#ifdef CONFIG_COLDFIRE
|
||||
/*
|
||||
|
|
@ -17,75 +15,12 @@
|
|||
/*
|
||||
* # of m68k interrupts
|
||||
*/
|
||||
#define SYS_IRQS 8
|
||||
#define NR_IRQS (24+SYS_IRQS)
|
||||
#define SYS_IRQS 8
|
||||
#define NR_IRQS (24 + SYS_IRQS)
|
||||
|
||||
#endif /* CONFIG_COLDFIRE */
|
||||
|
||||
/*
|
||||
* Interrupt source definitions
|
||||
* General interrupt sources are the level 1-7.
|
||||
* Adding an interrupt service routine for one of these sources
|
||||
* results in the addition of that routine to a chain of routines.
|
||||
* Each one is called in succession. Each individual interrupt
|
||||
* service routine should determine if the device associated with
|
||||
* that routine requires service.
|
||||
*/
|
||||
|
||||
#define IRQ1 (1) /* level 1 interrupt */
|
||||
#define IRQ2 (2) /* level 2 interrupt */
|
||||
#define IRQ3 (3) /* level 3 interrupt */
|
||||
#define IRQ4 (4) /* level 4 interrupt */
|
||||
#define IRQ5 (5) /* level 5 interrupt */
|
||||
#define IRQ6 (6) /* level 6 interrupt */
|
||||
#define IRQ7 (7) /* level 7 interrupt (non-maskable) */
|
||||
|
||||
/*
|
||||
* Machine specific interrupt sources.
|
||||
*
|
||||
* Adding an interrupt service routine for a source with this bit
|
||||
* set indicates a special machine specific interrupt source.
|
||||
* The machine specific files define these sources.
|
||||
*
|
||||
* The IRQ_MACHSPEC bit is now gone - the only thing it did was to
|
||||
* introduce unnecessary overhead.
|
||||
*
|
||||
* All interrupt handling is actually machine specific so it is better
|
||||
* to use function pointers, as used by the Sparc port, and select the
|
||||
* interrupt handling functions when initializing the kernel. This way
|
||||
* we save some unnecessary overhead at run-time.
|
||||
* 01/11/97 - Jes
|
||||
*/
|
||||
|
||||
extern void (*mach_enable_irq)(unsigned int);
|
||||
extern void (*mach_disable_irq)(unsigned int);
|
||||
|
||||
/*
|
||||
* various flags for request_irq() - the Amiga now uses the standard
|
||||
* mechanism like all other architectures - IRQF_DISABLED and
|
||||
* IRQF_SHARED are your friends.
|
||||
*/
|
||||
#define IRQ_FLG_LOCK (0x0001) /* handler is not replaceable */
|
||||
#define IRQ_FLG_REPLACE (0x0002) /* replace existing handler */
|
||||
#define IRQ_FLG_FAST (0x0004)
|
||||
#define IRQ_FLG_SLOW (0x0008)
|
||||
#define IRQ_FLG_STD (0x8000) /* internally used */
|
||||
|
||||
#ifdef CONFIG_M68360
|
||||
|
||||
#define CPM_INTERRUPT IRQ4
|
||||
|
||||
/* see MC68360 User's Manual, p. 7-377 */
|
||||
#define CPM_VECTOR_BASE 0x04 /* 3 MSbits of CPM vector */
|
||||
|
||||
#endif /* CONFIG_M68360 */
|
||||
|
||||
/*
|
||||
* Some drivers want these entry points
|
||||
*/
|
||||
#define enable_irq(x) do { } while (0)
|
||||
#define disable_irq(x) do { } while (0)
|
||||
#define disable_irq_nosync(x) disable_irq(x)
|
||||
#define irq_canonicalize(irq) (irq)
|
||||
|
||||
#endif /* _M68K_IRQ_H_ */
|
||||
#endif /* _M68KNOMMU_IRQ_H_ */
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
#ifndef _M68K_IRQNODE_H_
|
||||
#define _M68K_IRQNODE_H_
|
||||
|
||||
#include <linux/interrupt.h>
|
||||
|
||||
/*
|
||||
* This structure is used to chain together the ISRs for a particular
|
||||
* interrupt source (if it supports chaining).
|
||||
*/
|
||||
typedef struct irq_node {
|
||||
irq_handler_t handler;
|
||||
unsigned long flags;
|
||||
void *dev_id;
|
||||
const char *devname;
|
||||
struct irq_node *next;
|
||||
} irq_node_t;
|
||||
|
||||
/*
|
||||
* This structure has only 4 elements for speed reasons
|
||||
*/
|
||||
struct irq_entry {
|
||||
irq_handler_t handler;
|
||||
unsigned long flags;
|
||||
void *dev_id;
|
||||
const char *devname;
|
||||
};
|
||||
|
||||
/* count of spurious interrupts */
|
||||
extern volatile unsigned int num_spurious;
|
||||
|
||||
/*
|
||||
* This function returns a new irq_node_t
|
||||
*/
|
||||
extern irq_node_t *new_irq_node(void);
|
||||
|
||||
#endif /* _M68K_IRQNODE_H_ */
|
||||
|
|
@ -3,3 +3,11 @@
|
|||
#include "m68360_quicc.h"
|
||||
#include "m68360_enet.h"
|
||||
|
||||
#ifdef CONFIG_M68360
|
||||
|
||||
#define CPM_INTERRUPT 4
|
||||
|
||||
/* see MC68360 User's Manual, p. 7-377 */
|
||||
#define CPM_VECTOR_BASE 0x04 /* 3 MSbits of CPM vector */
|
||||
|
||||
#endif /* CONFIG_M68360 */
|
||||
|
|
|
|||
|
|
@ -16,6 +16,10 @@
|
|||
typedef void (*e_vector)(void);
|
||||
|
||||
extern e_vector vectors[];
|
||||
extern void init_vectors(void);
|
||||
extern void enable_vector(unsigned int irq);
|
||||
extern void disable_vector(unsigned int irq);
|
||||
extern void ack_vector(unsigned int irq);
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue