Hi!
I'm working here with spacecom1 board... you probably do not want to
know about. Unfortunately, the board does not work with 2.6.34, and I
believe identified the offending patch...
commit 19851c58e680f71d087b79b53edbf814193e1d33
Author: Eric Miao <[email protected]>
Date: Sat Dec 26 16:23:02 2009 +0800
[ARM] sa1111: allow cascaded IRQs to be used by platforms
Signed-off-by: Eric Miao <[email protected]>
Now, what happens is this:
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -35,6 +35,58 @@
#include <asm/hardware/sa1111.h>
+/* SA1111 IRQs */
+#define IRQ_GPAIN0 (0)
....
--- a/arch/arm/mach-pxa/include/mach/irqs.h
+++ b/arch/arm/mach-pxa/include/mach/irqs.h
@@ -135,58 +135,6 @@
#define IRQ_BOARD_END (IRQ_BOARD_START + 16)
#endif
-#define IRQ_SA1111_START (IRQ_BOARD_END)
-#define IRQ_GPAIN0 (IRQ_BOARD_END + 0)
...
So, in 2.6.34, irq_base needs to be added to IRQ_GPAIN0 and
similar. Unfortunately, it is not added at least in some users,
registering sa1111 interrupts over those at zero, breaking everything.
I have to do something like this to get my board back to boot.
Signed-off-by: Pavel Machek <[email protected]>
(but you probably don't want to apply the patch just like that).
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index f81543a..f1c0552 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -448,9 +448,9 @@ static struct irq_chip sa1111_high_chip = {
static void sa1111_setup_irq(struct sa1111 *sachip)
{
void __iomem *irqbase = sachip->base + SA1111_INTC;
+ int irq_base = sachip->irq_base;
unsigned int irq;
-#if 0
/*
* We're guaranteed that this region hasn't been taken.
*/
@@ -476,26 +476,28 @@ static void sa1111_setup_irq(struct sa1111 *sachip)
sa1111_writel(~0, irqbase + SA1111_INTSTATCLR1);
for (irq = IRQ_GPAIN0; irq <= SSPROR; irq++) {
- set_irq_chip(irq, &sa1111_low_chip);
- set_irq_chip_data(irq, sachip);
- set_irq_handler(irq, handle_edge_irq);
- set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
+ printk("Setting up irq %d (irq_base %d)\n", irq, sachip->irq_base);
+ set_irq_chip(irq + irq_base, &sa1111_low_chip);
+ set_irq_chip_data(irq + irq_base, sachip);
+ set_irq_handler(irq + irq_base, handle_edge_irq);
+ set_irq_flags(irq + irq_base, IRQF_VALID | IRQF_PROBE);
}
for (irq = AUDXMTDMADONEA; irq <= IRQ_S1_BVD1_STSCHG; irq++) {
- set_irq_chip(irq, &sa1111_high_chip);
- set_irq_chip_data(irq, sachip);
- set_irq_handler(irq, handle_edge_irq);
- set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
+ set_irq_chip(irq + irq_base, &sa1111_high_chip);
+ set_irq_chip_data(irq + irq_base, sachip);
+ set_irq_handler(irq + irq_base, handle_edge_irq);
+ set_irq_flags(irq + irq_base, IRQF_VALID | IRQF_PROBE);
}
+ printk("Registering sa1111 irq: %d\n", sachip->irq);
+
/*
* Register SA1111 interrupt
*/
set_irq_type(sachip->irq, IRQ_TYPE_EDGE_RISING);
set_irq_data(sachip->irq, sachip);
set_irq_chained_handler(sachip->irq, sa1111_irq_handler);
-#endif
}
/*
@@ -708,6 +710,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq)
sachip->phys = mem->start;
sachip->irq = irq;
+ sachip->irq_base = IRQ_BOARD_END;
/*
* Map the whole region. This also maps the
Fix up interrupt numbers on SA1111 companion chip.
Signed-off-by: Pavel Machek <[email protected]>
---
This seems to fix the interrupt issue for me... USB now gets some
interrupts. But some SA1111 expert should take a look at this.
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index a52a27c..e47a474 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -448,6 +454,7 @@ static struct irq_chip sa1111_high_chip = {
static void sa1111_setup_irq(struct sa1111 *sachip)
{
void __iomem *irqbase = sachip->base + SA1111_INTC;
+ int irq_base = sachip->irq_base;
unsigned int irq;
/*
@@ -475,19 +482,19 @@ static void sa1111_setup_irq(struct sa1111 *sachip)
sa1111_writel(~0, irqbase + SA1111_INTSTATCLR1);
for (irq = IRQ_GPAIN0; irq <= SSPROR; irq++) {
- set_irq_chip(irq, &sa1111_low_chip);
- set_irq_chip_data(irq, sachip);
- set_irq_handler(irq, handle_edge_irq);
- set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
+ set_irq_chip(irq + irq_base, &sa1111_low_chip);
+ set_irq_chip_data(irq + irq_base, sachip);
+ set_irq_handler(irq + irq_base, handle_edge_irq);
+ set_irq_flags(irq + irq_base, IRQF_VALID | IRQF_PROBE);
}
for (irq = AUDXMTDMADONEA; irq <= IRQ_S1_BVD1_STSCHG; irq++) {
- set_irq_chip(irq, &sa1111_high_chip);
- set_irq_chip_data(irq, sachip);
- set_irq_handler(irq, handle_edge_irq);
- set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
+ set_irq_chip(irq + irq_base, &sa1111_high_chip);
+ set_irq_chip_data(irq + irq_base, sachip);
+ set_irq_handler(irq + irq_base, handle_edge_irq);
+ set_irq_flags(irq + irq_base, IRQF_VALID | IRQF_PROBE);
}
/*
* Register SA1111 interrupt
*/
@@ -782,6 +839,15 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq)
else
has_devs &= ~(1 << 1);
+ for (i = 0; i < ARRAY_SIZE(sa1111_devices); i++) {
+ int j;
+ for (j = 0; j < 6; j++)
+ if (sa1111_devices[i].irq[j]) {
+ sa1111_devices[i].irq[j] += sachip->irq_base;
+ printk("Adjusting interrupt %d\n", sa1111_devices[i].irq[j]);
+ }
+ }
+
for (i = 0; i < ARRAY_SIZE(sa1111_devices); i++)
if (has_devs & (1 << i))
sa1111_init_one_child(sachip, mem, &sa1111_devices[i]);
@@ -853,8 +919,13 @@ int dma_needs_bounce(struct device *dev, dma_addr_t addr, size_t size)
* SDRAM bank 1 on Neponset). The default configuration selects
* Assabet, so any address in bank 1 is necessarily invalid.
*/
+#ifdef CONFIG_MACH_SPACECOM1
+ return ((machine_is_spacecom1()) &&
+ (addr >= 0xa0100000 || (addr + size) >= 0xa0100000));
+#else
return ((machine_is_assabet() || machine_is_pfs168()) &&
(addr >= 0xc8000000 || (addr + size) >= 0xc8000000));
+#endif
}
struct sa1111_save_data {