aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.0/940-bcm47xx-yenta.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2011-06-18 15:24:44 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2011-06-18 15:24:44 +0000
commit75f9e0c615d2fe50259ac6bc96e2b849fc975ea7 (patch)
treef0dc7985c9d6b4d5249e51c4a2371fe84806235d /target/linux/brcm47xx/patches-3.0/940-bcm47xx-yenta.patch
parent2e1b73912d4eb749901c4f0ab248b64339895cb1 (diff)
downloadupstream-75f9e0c615d2fe50259ac6bc96e2b849fc975ea7.tar.gz
upstream-75f9e0c615d2fe50259ac6bc96e2b849fc975ea7.tar.bz2
upstream-75f9e0c615d2fe50259ac6bc96e2b849fc975ea7.zip
brcm47xx: add support for kernel 3.0
SVN-Revision: 27217
Diffstat (limited to 'target/linux/brcm47xx/patches-3.0/940-bcm47xx-yenta.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.0/940-bcm47xx-yenta.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.0/940-bcm47xx-yenta.patch b/target/linux/brcm47xx/patches-3.0/940-bcm47xx-yenta.patch
new file mode 100644
index 0000000000..c65958eda8
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.0/940-bcm47xx-yenta.patch
@@ -0,0 +1,46 @@
+--- a/drivers/pcmcia/yenta_socket.c
++++ b/drivers/pcmcia/yenta_socket.c
+@@ -920,6 +920,8 @@ static unsigned int yenta_probe_irq(stru
+ * Probe for usable interrupts using the force
+ * register to generate bogus card status events.
+ */
++#ifndef CONFIG_BCM47XX
++ /* WRT54G3G does not like this */
+ cb_writel(socket, CB_SOCKET_EVENT, -1);
+ cb_writel(socket, CB_SOCKET_MASK, CB_CSTSMASK);
+ reg = exca_readb(socket, I365_CSCINT);
+@@ -935,6 +937,7 @@ static unsigned int yenta_probe_irq(stru
+ }
+ cb_writel(socket, CB_SOCKET_MASK, 0);
+ exca_writeb(socket, I365_CSCINT, reg);
++#endif
+
+ mask = probe_irq_mask(val) & 0xffff;
+
+@@ -1019,6 +1022,10 @@ static void yenta_get_socket_capabilitie
+ else
+ socket->socket.irq_mask = 0;
+
++ /* irq mask probing is broken for the WRT54G3G */
++ if (socket->socket.irq_mask == 0)
++ socket->socket.irq_mask = 0x6f8;
++
+ dev_printk(KERN_INFO, &socket->dev->dev,
+ "ISA IRQ mask 0x%04x, PCI irq %d\n",
+ socket->socket.irq_mask, socket->cb_irq);
+@@ -1257,6 +1264,15 @@ static int __devinit yenta_probe(struct
+ dev_printk(KERN_INFO, &dev->dev,
+ "Socket status: %08x\n", cb_readl(socket, CB_SOCKET_STATE));
+
++ /* Generate an interrupt on card insert/remove */
++ config_writew(socket, CB_SOCKET_MASK, CB_CSTSMASK | CB_CDMASK);
++
++ /* Set up Multifunction Routing Status Register */
++ config_writew(socket, 0x8C, 0x1000 /* MFUNC3 to GPIO3 */ | 0x2 /* MFUNC0 to INTA */);
++
++ /* Switch interrupts to parallelized */
++ config_writeb(socket, 0x92, 0x64);
++
+ yenta_fixup_parent_bridge(dev->subordinate);
+
+ /* Register it with the pcmcia layer.. */