diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2017-07-02 14:12:45 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2017-07-02 23:10:06 +0200 |
| commit | 1f991bb365b1ee66846e0785dc36dd5914f83398 (patch) | |
| tree | 978b63218557bf42e48f009ad25dac506d87a6a9 /target/linux/brcm47xx/patches-4.9/940-bcm47xx-yenta.patch | |
| parent | b56995550ac97ee54a5e999f902f92a1879066b5 (diff) | |
| download | upstream-1f991bb365b1ee66846e0785dc36dd5914f83398.tar.gz upstream-1f991bb365b1ee66846e0785dc36dd5914f83398.tar.bz2 upstream-1f991bb365b1ee66846e0785dc36dd5914f83398.zip | |
brcm47xx: Add support for kernel 4.9
I tested this on a WRT54GS and a WRT610N V1.
The WRT610N does not boot when the kernel is too big, so I deactivated KALLSYMS
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/brcm47xx/patches-4.9/940-bcm47xx-yenta.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-4.9/940-bcm47xx-yenta.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-4.9/940-bcm47xx-yenta.patch b/target/linux/brcm47xx/patches-4.9/940-bcm47xx-yenta.patch new file mode 100644 index 0000000000..00a44d6317 --- /dev/null +++ b/target/linux/brcm47xx/patches-4.9/940-bcm47xx-yenta.patch @@ -0,0 +1,46 @@ +--- a/drivers/pcmcia/yenta_socket.c ++++ b/drivers/pcmcia/yenta_socket.c +@@ -919,6 +919,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); +@@ -934,6 +936,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; + +@@ -1018,6 +1021,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); + } +@@ -1250,6 +1257,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.. */ |