aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2006-09-18 18:24:10 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-09-25 05:25:49 -0400
commit7412b10f7967ef4210ed6f793004d23642dc5140 (patch)
treef82586f106e50c16b84878cee8e9265dfd9db5e5 /arch
parentd7d214e974b94e8332d1f6c16f6f19b661dfa855 (diff)
[ARM] 3829/1: iop3xx: optimise irq entry macros
Squeeze three instructions out of the iop32x irq demuxer, and nine out of the iop33x irq demuxer by using the hardware vector generator. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-iop33x/irq.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/mach-iop33x/irq.c b/arch/arm/mach-iop33x/irq.c
index 675ed3989973..3c720551ac12 100644
--- a/arch/arm/mach-iop33x/irq.c
+++ b/arch/arm/mach-iop33x/irq.c
@@ -57,6 +57,20 @@ static inline void intstr_write1(u32 val)
57 iop3xx_cp6_disable(); 57 iop3xx_cp6_disable();
58} 58}
59 59
60static inline void intbase_write(u32 val)
61{
62 iop3xx_cp6_enable();
63 asm volatile("mcr p6, 0, %0, c12, c0, 0" : : "r" (val));
64 iop3xx_cp6_disable();
65}
66
67static inline void intsize_write(u32 val)
68{
69 iop3xx_cp6_enable();
70 asm volatile("mcr p6, 0, %0, c13, c0, 0" : : "r" (val));
71 iop3xx_cp6_disable();
72}
73
60static void 74static void
61iop331_irq_mask1 (unsigned int irq) 75iop331_irq_mask1 (unsigned int irq)
62{ 76{
@@ -107,6 +121,8 @@ void __init iop331_init_irq(void)
107 intctl_write1(0); 121 intctl_write1(0);
108 intstr_write0(0); // treat all as IRQ 122 intstr_write0(0); // treat all as IRQ
109 intstr_write1(0); 123 intstr_write1(0);
124 intbase_write(0);
125 intsize_write(1);
110 if(machine_is_iq80331()) // all interrupts are inputs to chip 126 if(machine_is_iq80331()) // all interrupts are inputs to chip
111 *IOP3XX_PCIIRSR = 0x0f; 127 *IOP3XX_PCIIRSR = 0x0f;
112 128