aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.6/0003-MIPS-lantiq-timer-irq-can-be-different-to-7.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/lantiq/patches-3.6/0003-MIPS-lantiq-timer-irq-can-be-different-to-7.patch')
-rw-r--r--target/linux/lantiq/patches-3.6/0003-MIPS-lantiq-timer-irq-can-be-different-to-7.patch84
1 files changed, 0 insertions, 84 deletions
diff --git a/target/linux/lantiq/patches-3.6/0003-MIPS-lantiq-timer-irq-can-be-different-to-7.patch b/target/linux/lantiq/patches-3.6/0003-MIPS-lantiq-timer-irq-can-be-different-to-7.patch
deleted file mode 100644
index 26519d0055..0000000000
--- a/target/linux/lantiq/patches-3.6/0003-MIPS-lantiq-timer-irq-can-be-different-to-7.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From c2c9c788b91218bccbb9ac31539ffa577fe502bf Mon Sep 17 00:00:00 2001
-From: John Crispin <blogic@openwrt.org>
-Date: Thu, 16 Aug 2012 08:09:20 +0000
-Subject: [PATCH 3/9] MIPS: lantiq: timer irq can be different to 7
-
-The SVIP SoC has its timer IRQ on a different IRQ than 7. Fix up the irq
-code to be able to handle this.
-
-Signed-off-by: John Crispin <blogic@openwrt.org>
-Patchwork: http://patchwork.linux-mips.org/patch/4229/
----
- arch/mips/lantiq/irq.c | 19 ++++++++++++++++---
- 1 file changed, 16 insertions(+), 3 deletions(-)
-
-diff --git a/arch/mips/lantiq/irq.c b/arch/mips/lantiq/irq.c
-index a2699a70..0cec43d 100644
---- a/arch/mips/lantiq/irq.c
-+++ b/arch/mips/lantiq/irq.c
-@@ -84,6 +84,7 @@ static unsigned short ltq_eiu_irq[MAX_EIU] = {
- static int exin_avail;
- static void __iomem *ltq_icu_membase[MAX_IM];
- static void __iomem *ltq_eiu_membase;
-+static struct irq_domain *ltq_domain;
-
- void ltq_disable_irq(struct irq_data *d)
- {
-@@ -219,10 +220,14 @@ DEFINE_HWx_IRQDISPATCH(2)
- DEFINE_HWx_IRQDISPATCH(3)
- DEFINE_HWx_IRQDISPATCH(4)
-
-+#if MIPS_CPU_TIMER_IRQ == 7
- static void ltq_hw5_irqdispatch(void)
- {
- do_IRQ(MIPS_CPU_TIMER_IRQ);
- }
-+#else
-+DEFINE_HWx_IRQDISPATCH(5)
-+#endif
-
- #ifdef CONFIG_MIPS_MT_SMP
- void __init arch_init_ipiirq(int irq, struct irqaction *action)
-@@ -270,7 +275,7 @@ asmlinkage void plat_irq_dispatch(void)
- unsigned int pending = read_c0_status() & read_c0_cause() & ST0_IM;
- unsigned int i;
-
-- if (pending & CAUSEF_IP7) {
-+ if ((MIPS_CPU_TIMER_IRQ == 7) && (pending & CAUSEF_IP7)) {
- do_IRQ(MIPS_CPU_TIMER_IRQ);
- goto out;
- } else {
-@@ -376,7 +381,7 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent)
- set_vi_handler(7, ltq_hw5_irqdispatch);
- }
-
-- irq_domain_add_linear(node,
-+ ltq_domain = irq_domain_add_linear(node,
- (MAX_IM * INT_NUM_IM_OFFSET) + MIPS_CPU_IRQ_CASCADE,
- &irq_domain_ops, 0);
-
-@@ -401,12 +406,20 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent)
-
- /* tell oprofile which irq to use */
- cp0_perfcount_irq = LTQ_PERF_IRQ;
-+
-+ /*
-+ * if the timer irq is not one of the mips irqs we need to
-+ * create a mapping
-+ */
-+ if (MIPS_CPU_TIMER_IRQ != 7)
-+ irq_create_mapping(ltq_domain, MIPS_CPU_TIMER_IRQ);
-+
- return 0;
- }
-
- unsigned int __cpuinit get_c0_compare_int(void)
- {
-- return CP0_LEGACY_COMPARE_IRQ;
-+ return MIPS_CPU_TIMER_IRQ;
- }
-
- static struct of_device_id __initdata of_irq_ids[] = {
---
-1.7.10.4
-