fix yenta_socket driver

Disable some calls the WRT54G3G implementation does not like
and enable interrupts to allow hotplugging.

SVN-Revision: 20240

diff --git a/target/linux/brcm47xx/patches-2.6.32/940-bcm47xx-yenta.patch b/target/linux/brcm47xx/patches-2.6.32/940-bcm47xx-yenta.patch
new file mode 100644 (file)
index 0000000..aaff523
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.32/940-bcm47xx-yenta.patch
@@ -0,0 +1,48 @@
+Index: linux-2.6.32.9/drivers/pcmcia/yenta_socket.c
+===================================================================
+--- linux-2.6.32.9.orig/drivers/pcmcia/yenta_socket.c  2010-03-12 09:43:45.000000000 +0100
++++ linux-2.6.32.9/drivers/pcmcia/yenta_socket.c       2010-03-12 10:05:33.000000000 +0100
+@@ -866,6 +866,8 @@
+        * 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);
+@@ -880,6 +882,7 @@
+       }
+       cb_writel(socket, CB_SOCKET_MASK, 0);
+       exca_writeb(socket, I365_CSCINT, 0);
++#endif
+ 
+       mask = probe_irq_mask(val) & 0xffff;
+ 
+@@ -960,6 +963,10 @@
+       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);
+@@ -1198,6 +1205,15 @@
+       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.. */

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
new file mode 100644 (file)
index 0000000..aaff523
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.33/940-bcm47xx-yenta.patch
@@ -0,0 +1,48 @@
+Index: linux-2.6.32.9/drivers/pcmcia/yenta_socket.c
+===================================================================
+--- linux-2.6.32.9.orig/drivers/pcmcia/yenta_socket.c  2010-03-12 09:43:45.000000000 +0100
++++ linux-2.6.32.9/drivers/pcmcia/yenta_socket.c       2010-03-12 10:05:33.000000000 +0100
+@@ -866,6 +866,8 @@
+        * 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);
+@@ -880,6 +882,7 @@
+       }
+       cb_writel(socket, CB_SOCKET_MASK, 0);
+       exca_writeb(socket, I365_CSCINT, 0);
++#endif
+ 
+       mask = probe_irq_mask(val) & 0xffff;
+ 
+@@ -960,6 +963,10 @@
+       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);
+@@ -1198,6 +1205,15 @@
+       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.. */