aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm47xx/patches-5.4/940-bcm47xx-yenta.patch
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2020-03-10 15:46:49 +0100
committerRafał Miłecki <rafal@milecki.pl>2020-03-10 15:50:55 +0100
commitd369d92fc7ed2970540235b27441f75a81ef171b (patch)
tree248c5980fda5e8631c4c7b58a2bf55756e475b1d /target/linux/bcm47xx/patches-5.4/940-bcm47xx-yenta.patch
parent5c98041d5a054bfe68070bbfa6fdeab63e6586fc (diff)
downloadupstream-d369d92fc7ed2970540235b27441f75a81ef171b.tar.gz
upstream-d369d92fc7ed2970540235b27441f75a81ef171b.tar.bz2
upstream-d369d92fc7ed2970540235b27441f75a81ef171b.zip
bcm47xx: add support for kernel 5.4
Ethernet, switch, LEDs, buttons, USB, sysupgrade & LuCI were successfully tested on BCM4706. WARNING: Hack for BCM4710 adding BCM4710_PROTECTED_FILL_TLB() to the local_r4k_flush_cache_sigtramp() could not be ported. That function has been dropped in: commit adcc81f148d7 ("MIPS: math-emu: Write-protect delay slot emulation pages") commit 3315b6b336c8 ("MIPS: Delete unused flush_cache_sigtramp()") it's unsure if that chipset will still work reliably. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/bcm47xx/patches-5.4/940-bcm47xx-yenta.patch')
-rw-r--r--target/linux/bcm47xx/patches-5.4/940-bcm47xx-yenta.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/target/linux/bcm47xx/patches-5.4/940-bcm47xx-yenta.patch b/target/linux/bcm47xx/patches-5.4/940-bcm47xx-yenta.patch
new file mode 100644
index 0000000000..c7b4358c5e
--- /dev/null
+++ b/target/linux/bcm47xx/patches-5.4/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_info(&socket->dev->dev, "ISA IRQ mask 0x%04x, PCI irq %d\n",
+ socket->socket.irq_mask, socket->cb_irq);
+ }
+@@ -1251,6 +1258,15 @@ static int yenta_probe(struct pci_dev *d
+ dev_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.. */