diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2010-10-06 20:11:03 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2010-10-06 20:11:03 +0000 |
| commit | 1e0d2eaad3a3a0a5475b80cc3543491a50271571 (patch) | |
| tree | 045e7b18b8430bb864d6db8ade6d7da622d3c40e /target/linux/brcm47xx/patches-2.6.36/940-bcm47xx-yenta.patch | |
| parent | bee3f2b4c07657275fb9f6b255c1852aaf86c3b4 (diff) | |
| download | upstream-1e0d2eaad3a3a0a5475b80cc3543491a50271571.tar.gz upstream-1e0d2eaad3a3a0a5475b80cc3543491a50271571.tar.bz2 upstream-1e0d2eaad3a3a0a5475b80cc3543491a50271571.zip | |
brcm47xx: add patches for kernel 2.6.36
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23278 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 46 |
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.. */ |