aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.36/940-bcm47xx-yenta.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-10-06 20:11:03 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-10-06 20:11:03 +0000
commitbadd8ffee3f2c34fe9a8188ff1f58a9a5dde874c (patch)
tree132b98754ab442130adb4465bbf54ad164e0fb78 /target/linux/brcm47xx/patches-2.6.36/940-bcm47xx-yenta.patch
parent8c33c86021965aff7ccd01b1a9c352318631840c (diff)
downloadupstream-badd8ffee3f2c34fe9a8188ff1f58a9a5dde874c.tar.gz
upstream-badd8ffee3f2c34fe9a8188ff1f58a9a5dde874c.tar.bz2
upstream-badd8ffee3f2c34fe9a8188ff1f58a9a5dde874c.zip
brcm47xx: add patches for kernel 2.6.36
SVN-Revision: 23278
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.36/940-bcm47xx-yenta.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.36/940-bcm47xx-yenta.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.36/940-bcm47xx-yenta.patch b/target/linux/brcm47xx/patches-2.6.36/940-bcm47xx-yenta.patch
new file mode 100644
index 0000000000..d50de3c3d6
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.36/940-bcm47xx-yenta.patch
@@ -0,0 +1,46 @@
+--- a/drivers/pcmcia/yenta_socket.c
++++ b/drivers/pcmcia/yenta_socket.c
+@@ -921,6 +921,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);
+@@ -936,6 +938,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;
+
+@@ -1020,6 +1023,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);
+@@ -1258,6 +1265,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.. */