1 --- a/arch/mips/ath79/irq.c
2 +++ b/arch/mips/ath79/irq.c
5 static void (*ath79_ip2_handler)(void);
6 static void (*ath79_ip3_handler)(void);
7 +static struct irq_chip ip2_chip;
8 +static struct irq_chip ip3_chip;
10 static void ath79_misc_irq_handler(unsigned int irq, struct irq_desc *desc)
12 @@ -149,8 +151,7 @@ static void ar934x_ip2_irq_init(void)
14 for (i = ATH79_IP2_IRQ_BASE;
15 i < ATH79_IP2_IRQ_BASE + ATH79_IP2_IRQ_COUNT; i++)
16 - irq_set_chip_and_handler(i, &dummy_irq_chip,
18 + irq_set_chip_and_handler(i, &ip2_chip, handle_level_irq);
20 irq_set_chained_handler(ATH79_CPU_IRQ(2), ar934x_ip2_irq_dispatch);
22 @@ -224,15 +225,13 @@ static void qca955x_irq_init(void)
24 for (i = ATH79_IP2_IRQ_BASE;
25 i < ATH79_IP2_IRQ_BASE + ATH79_IP2_IRQ_COUNT; i++)
26 - irq_set_chip_and_handler(i, &dummy_irq_chip,
28 + irq_set_chip_and_handler(i, &ip2_chip, handle_level_irq);
30 irq_set_chained_handler(ATH79_CPU_IRQ(2), qca955x_ip2_irq_dispatch);
32 for (i = ATH79_IP3_IRQ_BASE;
33 i < ATH79_IP3_IRQ_BASE + ATH79_IP3_IRQ_COUNT; i++)
34 - irq_set_chip_and_handler(i, &dummy_irq_chip,
36 + irq_set_chip_and_handler(i, &ip3_chip, handle_level_irq);
38 irq_set_chained_handler(ATH79_CPU_IRQ(3), qca955x_ip3_irq_dispatch);
40 @@ -313,15 +312,13 @@ static void qca956x_irq_init(void)
42 for (i = ATH79_IP2_IRQ_BASE;
43 i < ATH79_IP2_IRQ_BASE + ATH79_IP2_IRQ_COUNT; i++)
44 - irq_set_chip_and_handler(i, &dummy_irq_chip,
46 + irq_set_chip_and_handler(i, &ip2_chip, handle_level_irq);
48 irq_set_chained_handler(ATH79_CPU_IRQ(2), qca956x_ip2_irq_dispatch);
50 for (i = ATH79_IP3_IRQ_BASE;
51 i < ATH79_IP3_IRQ_BASE + ATH79_IP3_IRQ_COUNT; i++)
52 - irq_set_chip_and_handler(i, &dummy_irq_chip,
54 + irq_set_chip_and_handler(i, &ip3_chip, handle_level_irq);
56 irq_set_chained_handler(ATH79_CPU_IRQ(3), qca956x_ip3_irq_dispatch);
58 @@ -430,8 +427,35 @@ static void ar934x_ip3_handler(void)
59 do_IRQ(ATH79_CPU_IRQ(3));
62 +static void ath79_ip2_disable(struct irq_data *data)
64 + disable_irq(ATH79_CPU_IRQ(2));
67 +static void ath79_ip2_enable(struct irq_data *data)
69 + enable_irq(ATH79_CPU_IRQ(2));
72 +static void ath79_ip3_disable(struct irq_data *data)
74 + disable_irq(ATH79_CPU_IRQ(3));
77 +static void ath79_ip3_enable(struct irq_data *data)
79 + enable_irq(ATH79_CPU_IRQ(3));
82 void __init arch_init_irq(void)
84 + ip2_chip = dummy_irq_chip;
85 + ip3_chip = dummy_irq_chip;
86 + ip2_chip.irq_disable = ath79_ip2_disable;
87 + ip2_chip.irq_enable = ath79_ip2_enable;
88 + ip3_chip.irq_disable = ath79_ip3_disable;
89 + ip3_chip.irq_enable = ath79_ip3_enable;
91 if (soc_is_ar71xx()) {
92 ath79_ip2_handler = ar71xx_ip2_handler;
93 ath79_ip3_handler = ar71xx_ip3_handler;