diff options
| author | Russell King <rmk@flint.arm.linux.org.uk> | 2003-08-05 22:39:43 +0100 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2003-08-05 22:39:43 +0100 |
| commit | 562f38692dd62bc7c3444fd20edfcb52cc72045d (patch) | |
| tree | b7a5414a8efb3d83824c08b6b45e8b5eee647aab /include/asm-arm | |
| parent | f3b47da15e21e99e8578ebed45c2244295585167 (diff) | |
[ARM] Remove more static register accesses from sa1111.c
Use the ioremapped region for accesses to SA1111 IRQ
controller registers.
Diffstat (limited to 'include/asm-arm')
| -rw-r--r-- | include/asm-arm/hardware/sa1111.h | 16 | ||||
| -rw-r--r-- | include/asm-arm/mach/irq.h | 5 |
2 files changed, 5 insertions, 16 deletions
diff --git a/include/asm-arm/hardware/sa1111.h b/include/asm-arm/hardware/sa1111.h index 189fd5085ace..f03d4c73b353 100644 --- a/include/asm-arm/hardware/sa1111.h +++ b/include/asm-arm/hardware/sa1111.h @@ -429,22 +429,6 @@ #define SA1111_WAKEPOL0 0x0034 #define SA1111_WAKEPOL1 0x0038 -#define INTTEST0 __CCREG(SA1111_INTC + SA1111_INTTEST0) -#define INTTEST1 __CCREG(SA1111_INTC + SA1111_INTTEST1) -#define INTEN0 __CCREG(SA1111_INTC + SA1111_INTEN0) -#define INTEN1 __CCREG(SA1111_INTC + SA1111_INTEN1) -#define INTPOL0 __CCREG(SA1111_INTC + SA1111_INTPOL0) -#define INTPOL1 __CCREG(SA1111_INTC + SA1111_INTPOL1) -#define INTTSTSEL __CCREG(SA1111_INTC + SA1111_INTTSTSEL) -#define INTSTATCLR0 __CCREG(SA1111_INTC + SA1111_INTSTATCLR0) -#define INTSTATCLR1 __CCREG(SA1111_INTC + SA1111_INTSTATCLR1) -#define INTSET0 __CCREG(SA1111_INTC + SA1111_INTSET0) -#define INTSET1 __CCREG(SA1111_INTC + SA1111_INTSET1) -#define WAKE_EN0 __CCREG(SA1111_INTC + SA1111_WAKEEN0) -#define WAKE_EN1 __CCREG(SA1111_INTC + SA1111_WAKEEN1) -#define WAKE_POL0 __CCREG(SA1111_INTC + SA1111_WAKEPOL0) -#define WAKE_POL1 __CCREG(SA1111_INTC + SA1111_WAKEPOL1) - /* * PS/2 Trackpad and Mouse Interfaces * diff --git a/include/asm-arm/mach/irq.h b/include/asm-arm/mach/irq.h index 03f2bfffa03a..bea9af3922cb 100644 --- a/include/asm-arm/mach/irq.h +++ b/include/asm-arm/mach/irq.h @@ -54,6 +54,8 @@ struct irqdesc { struct irqchip *chip; struct irqaction *action; struct list_head pend; + void *chipdata; + void *data; unsigned int disable_depth; unsigned int triggered: 1; /* IRQ has occurred */ @@ -88,6 +90,9 @@ void __set_irq_handler(unsigned int irq, irq_handler_t, int); */ #define set_irq_handler(irq,handler) __set_irq_handler(irq,handler,0) #define set_irq_chained_handler(irq,handler) __set_irq_handler(irq,handler,1) +#define set_irq_data(irq,d) do { irq_desc[irq].data = d; } while (0) +#define set_irq_chipdata(irq,d) do { irq_desc[irq].chipdata = d; } while (0) +#define get_irq_chipdata(irq) (irq_desc[irq].chipdata) void set_irq_chip(unsigned int irq, struct irqchip *); void set_irq_flags(unsigned int irq, unsigned int flags); |