lkml.org 
[lkml]   [2010]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: 19851c58e68 breaks spacecom1 board

Fix up interrupt numbers on SA1111 companion chip.

Signed-off-by: Pavel Machek <pavel@ucw.cz>

---

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 {

\
 
 \ /
  Last update: 2010-11-19 13:55    [W:0.035 / U:2.180 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site