1 files changed, 26 insertions, 6 deletions

diff --git a/arch/arm/mach-rpc/ecard.c b/arch/arm/mach-rpc/ecard.c
index 04b2f22c2739..eec5ecd6e948 100644
--- a/arch/arm/mach-rpc/ecard.c
+++ b/arch/arm/mach-rpc/ecard.c
@@ -70,17 +70,21 @@ struct expcard_blacklist {
         unsigned short   manufacturer;
         unsigned short   product;
         const char      *type;
+        void (*init)(ecard_t *ec);
 };
 
 static ecard_t *cards;
 static ecard_t *slot_to_expcard[MAX_ECARDS];
 static unsigned int ectcr;
 
+static void atomwide_3p_quirk(ecard_t *ec);
+
 /* List of descriptions of cards which don't have an extended
  * identification, or chunk directories containing a description.
  */
 static struct expcard_blacklist __initdata blacklist[] = {
-        { MANU_ACORN, PROD_ACORN_ETHER1, "Acorn Ether1" }
+        { MANU_ACORN, PROD_ACORN_ETHER1, "Acorn Ether1" },
+        { MANU_ATOMWIDE, PROD_ATOMWIDE_3PSERIAL, NULL, atomwide_3p_quirk },
 };
 
 asmlinkage extern int
@@ -496,18 +500,21 @@ static void ecard_dump_irq_state(void)
         printk("Expansion card IRQ state:\n");
 
         for (ec = cards; ec; ec = ec->next) {
+                const char *claimed;
+
                 if (ec->slot_no == 8)
                         continue;
 
-                printk("  %d: %sclaimed, ",
-                       ec->slot_no, ec->claimed ? "" : "not ");
+                claimed = ec->claimed ? "" : "not ";
 
                 if (ec->ops && ec->ops->irqpending &&
                     ec->ops != &ecard_default_ops)
-                        printk("irq %spending\n",
+                        printk("  %d: %sclaimed irq %spending\n",
+                               ec->slot_no, claimed,
                                ec->ops->irqpending(ec) ? "" : "not ");
                 else
-                        printk("irqaddr %p, mask = %02X, status = %02X\n",
+                        printk("  %d: %sclaimed irqaddr %p, mask = %02X, status = %02X\n",
+                               ec->slot_no, claimed,
                                ec->irqaddr, ec->irqmask, readb(ec->irqaddr));
         }
 }
@@ -868,6 +875,16 @@ void __iomem *ecardm_iomap(struct expansion_card *ec, unsigned int res,
 }
 EXPORT_SYMBOL(ecardm_iomap);
 
+static void atomwide_3p_quirk(ecard_t *ec)
+{
+        void __iomem *addr = __ecard_address(ec, ECARD_IOC, ECARD_SYNC);
+        unsigned int i;
+
+        /* Disable interrupts on each port */
+        for (i = 0x2000; i <= 0x2800; i += 0x0400)
+                writeb(0, addr + i + 4);        
+}
+
 /*
  * Probe for an expansion card.
  *
@@ -924,7 +941,10 @@ static int __init ecard_probe(int slot, unsigned irq, card_type_t type)
         for (i = 0; i < ARRAY_SIZE(blacklist); i++)
                 if (blacklist[i].manufacturer == ec->cid.manufacturer &&
                     blacklist[i].product == ec->cid.product) {
-                        ec->card_desc = blacklist[i].type;
+                        if (blacklist[i].type)
+                                ec->card_desc = blacklist[i].type;
+                        if (blacklist[i].init)
+                                blacklist[i].init(ec);
                         break;
                 }