aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.3/0004-MIPS-lantiq-make-irq.c-support-the-FALC-ON.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2012-08-03 08:53:02 +0000
committerJohn Crispin <john@openwrt.org>2012-08-03 08:53:02 +0000
commit060b161ca6f18e0e022da1483723ad2e9335bca7 (patch)
treedc652c26bed4d4b79395a6daafaa5da59000e940 /target/linux/lantiq/patches-3.3/0004-MIPS-lantiq-make-irq.c-support-the-FALC-ON.patch
parent162e272b4b2b770cd5eb97006bb4ff99b09bd8de (diff)
downloadupstream-060b161ca6f18e0e022da1483723ad2e9335bca7.tar.gz
upstream-060b161ca6f18e0e022da1483723ad2e9335bca7.tar.bz2
upstream-060b161ca6f18e0e022da1483723ad2e9335bca7.zip
cleanup patches
SVN-Revision: 32953
Diffstat (limited to 'target/linux/lantiq/patches-3.3/0004-MIPS-lantiq-make-irq.c-support-the-FALC-ON.patch')
-rw-r--r--target/linux/lantiq/patches-3.3/0004-MIPS-lantiq-make-irq.c-support-the-FALC-ON.patch69
1 files changed, 0 insertions, 69 deletions
diff --git a/target/linux/lantiq/patches-3.3/0004-MIPS-lantiq-make-irq.c-support-the-FALC-ON.patch b/target/linux/lantiq/patches-3.3/0004-MIPS-lantiq-make-irq.c-support-the-FALC-ON.patch
deleted file mode 100644
index 1ca446ef03..0000000000
--- a/target/linux/lantiq/patches-3.3/0004-MIPS-lantiq-make-irq.c-support-the-FALC-ON.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 9eabaa2969af9aa157d50b7cfbb447f65db95f06 Mon Sep 17 00:00:00 2001
-From: John Crispin <blogic@openwrt.org>
-Date: Thu, 11 Aug 2011 12:25:55 +0200
-Subject: [PATCH 04/70] MIPS: lantiq: make irq.c support the FALC-ON
-
-There are minor differences in how irqs work on xway and falcon socs.
-Xway needs 2 quirks that we need to disable for falcon to also work with
-this code.
-
-* EBU irq does not need to send a special ack to the EBU
-* The EIU does not exist
-
-Signed-off-by: Thomas Langer <thomas.langer@lantiq.com>
-Signed-off-by: John Crispin <blogic@openwrt.org>
----
- arch/mips/lantiq/irq.c | 24 +++++++++++++-----------
- 1 files changed, 13 insertions(+), 11 deletions(-)
-
---- a/arch/mips/lantiq/irq.c
-+++ b/arch/mips/lantiq/irq.c
-@@ -195,7 +195,7 @@ static void ltq_hw_irqdispatch(int modul
- do_IRQ((int)irq + INT_NUM_IM0_IRL0 + (INT_NUM_IM_OFFSET * module));
-
- /* if this is a EBU irq, we need to ack it or get a deadlock */
-- if ((irq == LTQ_ICU_EBU_IRQ) && (module == 0))
-+ if ((irq == LTQ_ICU_EBU_IRQ) && (module == 0) && LTQ_EBU_PCC_ISTAT)
- ltq_ebu_w32(ltq_ebu_r32(LTQ_EBU_PCC_ISTAT) | 0x10,
- LTQ_EBU_PCC_ISTAT);
- }
-@@ -259,17 +259,19 @@ void __init arch_init_irq(void)
- if (!ltq_icu_membase)
- panic("Failed to remap icu memory");
-
-- if (insert_resource(&iomem_resource, &ltq_eiu_resource) < 0)
-- panic("Failed to insert eiu memory");
-+ if (LTQ_EIU_BASE_ADDR) {
-+ if (insert_resource(&iomem_resource, &ltq_eiu_resource) < 0)
-+ panic("Failed to insert eiu memory\n");
-+
-+ if (request_mem_region(ltq_eiu_resource.start,
-+ resource_size(&ltq_eiu_resource), "eiu") < 0)
-+ panic("Failed to request eiu memory\n");
-
-- if (request_mem_region(ltq_eiu_resource.start,
-- resource_size(&ltq_eiu_resource), "eiu") < 0)
-- panic("Failed to request eiu memory");
--
-- ltq_eiu_membase = ioremap_nocache(ltq_eiu_resource.start,
-+ ltq_eiu_membase = ioremap_nocache(ltq_eiu_resource.start,
- resource_size(&ltq_eiu_resource));
-- if (!ltq_eiu_membase)
-- panic("Failed to remap eiu memory");
-+ if (!ltq_eiu_membase)
-+ panic("Failed to remap eiu memory\n");
-+ }
-
- /* make sure all irqs are turned off by default */
- for (i = 0; i < 5; i++)
-@@ -295,8 +297,8 @@ void __init arch_init_irq(void)
-
- for (i = INT_NUM_IRQ0;
- i <= (INT_NUM_IRQ0 + (5 * INT_NUM_IM_OFFSET)); i++)
-- if ((i == LTQ_EIU_IR0) || (i == LTQ_EIU_IR1) ||
-- (i == LTQ_EIU_IR2))
-+ if (((i == LTQ_EIU_IR0) || (i == LTQ_EIU_IR1) ||
-+ (i == LTQ_EIU_IR2)) && LTQ_EIU_BASE_ADDR)
- irq_set_chip_and_handler(i, &ltq_eiu_type,
- handle_level_irq);
- /* EIU3-5 only exist on ar9 and vr9 */