1 From 353f07637d82cf485a9319d203a6ed9b38590526 Mon Sep 17 00:00:00 2001
2 From: Jonas Gorski <jogo@openwrt.org>
3 Date: Thu, 25 Apr 2013 15:35:12 +0200
4 Subject: [PATCH 09/14] MIPS: BCM63XX: use a helper for getting the right
7 Signed-off-by: Jonas Gorski <jogo@openwrt.org>
9 arch/mips/bcm63xx/irq.c | 30 ++++++++++++++++++++++++------
10 1 file changed, 24 insertions(+), 6 deletions(-)
12 --- a/arch/mips/bcm63xx/irq.c
13 +++ b/arch/mips/bcm63xx/irq.c
14 @@ -284,6 +284,20 @@ static inline u32 get_ext_irq_perf_reg(i
15 return ext_irq_cfg_reg2;
18 +static inline u32 get_irq_stat_addr(int pin)
21 + return irq_stat_addr0;
22 + return irq_stat_addr1;
25 +static inline u32 get_irq_mask_addr(int pin)
28 + return irq_mask_addr0;
29 + return irq_mask_addr1;
32 static inline void handle_internal(int intbit)
34 if (is_ext_irq_cascaded &&
35 @@ -307,13 +321,15 @@ void __dispatch_internal_##width(void)
36 unsigned int src, tgt; \
37 bool irqs_pending = false; \
39 + u32 irq_stat_addr = get_irq_stat_addr(0); \
40 + u32 irq_mask_addr = get_irq_mask_addr(0); \
42 /* read registers in reverse order */ \
43 for (src = 0, tgt = (width / 32); src < (width / 32); src++) { \
46 - val = bcm_readl(irq_stat_addr0 + src * sizeof(u32)); \
47 - val &= bcm_readl(irq_mask_addr0 + src * sizeof(u32)); \
48 + val = bcm_readl(irq_stat_addr + src * sizeof(u32)); \
49 + val &= bcm_readl(irq_mask_addr + src * sizeof(u32)); \
50 pending[--tgt] = val; \
53 @@ -339,10 +355,11 @@ static void __internal_irq_mask_##width(
55 unsigned reg = (irq / 32) ^ (width/32 - 1); \
56 unsigned bit = irq & 0x1f; \
57 + u32 irq_mask_addr = get_irq_mask_addr(0); \
59 - val = bcm_readl(irq_mask_addr0 + reg * sizeof(u32)); \
60 + val = bcm_readl(irq_mask_addr + reg * sizeof(u32)); \
62 - bcm_writel(val, irq_mask_addr0 + reg * sizeof(u32)); \
63 + bcm_writel(val, irq_mask_addr + reg * sizeof(u32)); \
66 static void __internal_irq_unmask_##width(unsigned int irq) \
67 @@ -350,10 +367,11 @@ static void __internal_irq_unmask_##widt
69 unsigned reg = (irq / 32) ^ (width/32 - 1); \
70 unsigned bit = irq & 0x1f; \
71 + u32 irq_mask_addr = get_irq_mask_addr(0); \
73 - val = bcm_readl(irq_mask_addr0 + reg * sizeof(u32)); \
74 + val = bcm_readl(irq_mask_addr + reg * sizeof(u32)); \
76 - bcm_writel(val, irq_mask_addr0 + reg * sizeof(u32)); \
77 + bcm_writel(val, irq_mask_addr + reg * sizeof(u32)); \
80 BUILD_IPIC_INTERNAL(32);