diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-07-19 20:07:24 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-07-19 20:07:24 +0000 |
commit | 0799e77a8b44009bb6fc34a314bcbf8c970ad47a (patch) | |
tree | 7b30087889876498529dd68e6f69634329a31c2b /target/linux/brcm47xx/patches-2.6.33/940-bcm47xx-yenta.patch | |
parent | d82495ee60b78b22dcb2d679e8f90ae898adbda3 (diff) | |
download | upstream-0799e77a8b44009bb6fc34a314bcbf8c970ad47a.tar.gz upstream-0799e77a8b44009bb6fc34a314bcbf8c970ad47a.tar.bz2 upstream-0799e77a8b44009bb6fc34a314bcbf8c970ad47a.zip |
brcm47xx: remove kernel 2.6.33
SVN-Revision: 22295
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.33/940-bcm47xx-yenta.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-2.6.33/940-bcm47xx-yenta.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.33/940-bcm47xx-yenta.patch b/target/linux/brcm47xx/patches-2.6.33/940-bcm47xx-yenta.patch deleted file mode 100644 index b92e085235..0000000000 --- a/target/linux/brcm47xx/patches-2.6.33/940-bcm47xx-yenta.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/drivers/pcmcia/yenta_socket.c -+++ b/drivers/pcmcia/yenta_socket.c -@@ -911,6 +911,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); - exca_writeb(socket, I365_CSCINT, 0); -@@ -925,6 +927,7 @@ static unsigned int yenta_probe_irq(stru - } - cb_writel(socket, CB_SOCKET_MASK, 0); - exca_writeb(socket, I365_CSCINT, 0); -+#endif - - mask = probe_irq_mask(val) & 0xffff; - -@@ -1005,6 +1008,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); -@@ -1243,6 +1250,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.. */ |