summaryrefslogtreecommitdiff
path: root/target/linux/brcm47xx/patches-2.6.33
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.33')
-rw-r--r--target/linux/brcm47xx/patches-2.6.33/180-ssb_extif_interrupt.patch36
-rw-r--r--target/linux/brcm47xx/patches-2.6.33/220-bcm5354.patch6
-rw-r--r--target/linux/brcm47xx/patches-2.6.33/930-bcm47xx-pci-iomem.patch51
-rw-r--r--target/linux/brcm47xx/patches-2.6.33/951-brcm4716-defines.patch2
4 files changed, 4 insertions, 91 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.33/180-ssb_extif_interrupt.patch b/target/linux/brcm47xx/patches-2.6.33/180-ssb_extif_interrupt.patch
deleted file mode 100644
index d89531cda1..0000000000
--- a/target/linux/brcm47xx/patches-2.6.33/180-ssb_extif_interrupt.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 83e34f03ee9b86b49bde4707a1fe03a1837e29be Mon Sep 17 00:00:00 2001
-From: Jochen Friedrich <jochen@scram.de>
-Date: Wed, 3 Feb 2010 21:28:11 +0100
-Subject: [PATCH 1/1] ssb: fix interrupt assignment
-
-Explicitely enable shared interrupt 2 for any core that didn't get a dedicated IRQ
-anymore (fallthrough case) and for EXTIF cores to make gpio interrupts work.
-Also remove a bogus comment.
-
-Signed-off-by: Jochen Friedrich <jochen@scram.de>
-Signed-off-by: John W. Linville <linville@tuxdriver.com>
----
- drivers/ssb/driver_mipscore.c | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
---- a/drivers/ssb/driver_mipscore.c
-+++ b/drivers/ssb/driver_mipscore.c
-@@ -270,7 +270,6 @@ void ssb_mipscore_init(struct ssb_mipsco
- set_irq(dev, irq++);
- }
- break;
-- /* fallthrough */
- case SSB_DEV_PCI:
- case SSB_DEV_ETHERNET:
- case SSB_DEV_ETHERNET_GBIT:
-@@ -281,6 +280,10 @@ void ssb_mipscore_init(struct ssb_mipsco
- set_irq(dev, irq++);
- break;
- }
-+ /* fallthrough */
-+ case SSB_DEV_EXTIF:
-+ set_irq(dev, 0);
-+ break;
- }
- }
- ssb_dprintk(KERN_INFO PFX "after irq reconfiguration\n");
diff --git a/target/linux/brcm47xx/patches-2.6.33/220-bcm5354.patch b/target/linux/brcm47xx/patches-2.6.33/220-bcm5354.patch
index f396ca745a..a6ab0292ba 100644
--- a/target/linux/brcm47xx/patches-2.6.33/220-bcm5354.patch
+++ b/target/linux/brcm47xx/patches-2.6.33/220-bcm5354.patch
@@ -1,6 +1,6 @@
--- a/drivers/ssb/driver_chipcommon.c
+++ b/drivers/ssb/driver_chipcommon.c
-@@ -258,6 +258,8 @@ void ssb_chipco_resume(struct ssb_chipco
+@@ -260,6 +260,8 @@ void ssb_chipco_resume(struct ssb_chipco
void ssb_chipco_get_clockcpu(struct ssb_chipcommon *cc,
u32 *plltype, u32 *n, u32 *m)
{
@@ -9,7 +9,7 @@
*n = chipco_read32(cc, SSB_CHIPCO_CLOCK_N);
*plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT);
switch (*plltype) {
-@@ -281,6 +283,8 @@ void ssb_chipco_get_clockcpu(struct ssb_
+@@ -283,6 +285,8 @@ void ssb_chipco_get_clockcpu(struct ssb_
void ssb_chipco_get_clockcontrol(struct ssb_chipcommon *cc,
u32 *plltype, u32 *n, u32 *m)
{
@@ -31,7 +31,7 @@
}
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
-@@ -1069,6 +1069,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
+@@ -1072,6 +1072,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
if (bus->chip_id == 0x5365) {
rate = 100000000;
diff --git a/target/linux/brcm47xx/patches-2.6.33/930-bcm47xx-pci-iomem.patch b/target/linux/brcm47xx/patches-2.6.33/930-bcm47xx-pci-iomem.patch
deleted file mode 100644
index 4f47a3c52d..0000000000
--- a/target/linux/brcm47xx/patches-2.6.33/930-bcm47xx-pci-iomem.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/drivers/ssb/driver_pcicore.c
-+++ b/drivers/ssb/driver_pcicore.c
-@@ -246,20 +246,12 @@ static struct pci_controller ssb_pcicore
- .pci_ops = &ssb_pcicore_pciops,
- .io_resource = &ssb_pcicore_io_resource,
- .mem_resource = &ssb_pcicore_mem_resource,
-- .mem_offset = 0x24000000,
- };
-
--static u32 ssb_pcicore_pcibus_iobase = 0x100;
--static u32 ssb_pcicore_pcibus_membase = SSB_PCI_DMA;
--
- /* This function is called when doing a pci_enable_device().
- * We must first check if the device is a device on the PCI-core bridge. */
- int ssb_pcicore_plat_dev_init(struct pci_dev *d)
- {
-- struct resource *res;
-- int pos, size;
-- u32 *base;
--
- if (d->bus->ops != &ssb_pcicore_pciops) {
- /* This is not a device on the PCI-core bridge. */
- return -ENODEV;
-@@ -268,27 +260,6 @@ int ssb_pcicore_plat_dev_init(struct pci
- ssb_printk(KERN_INFO "PCI: Fixing up device %s\n",
- pci_name(d));
-
-- /* Fix up resource bases */
-- for (pos = 0; pos < 6; pos++) {
-- res = &d->resource[pos];
-- if (res->flags & IORESOURCE_IO)
-- base = &ssb_pcicore_pcibus_iobase;
-- else
-- base = &ssb_pcicore_pcibus_membase;
-- res->flags |= IORESOURCE_PCI_FIXED;
-- if (res->end) {
-- size = res->end - res->start + 1;
-- if (*base & (size - 1))
-- *base = (*base + size) & ~(size - 1);
-- res->start = *base;
-- res->end = res->start + size - 1;
-- *base += size;
-- pci_write_config_dword(d, PCI_BASE_ADDRESS_0 + (pos << 2), res->start);
-- }
-- /* Fix up PCI bridge BAR0 only */
-- if (d->bus->number == 0 && PCI_SLOT(d->devfn) == 0)
-- break;
-- }
- /* Fix up interrupt lines */
- d->irq = ssb_mips_irq(extpci_core->dev) + 2;
- pci_write_config_byte(d, PCI_INTERRUPT_LINE, d->irq);
diff --git a/target/linux/brcm47xx/patches-2.6.33/951-brcm4716-defines.patch b/target/linux/brcm47xx/patches-2.6.33/951-brcm4716-defines.patch
index 5cc51100f8..482dbad02e 100644
--- a/target/linux/brcm47xx/patches-2.6.33/951-brcm4716-defines.patch
+++ b/target/linux/brcm47xx/patches-2.6.33/951-brcm4716-defines.patch
@@ -60,7 +60,7 @@
/* Enumeration space constants */
#define SSB_CORE_SIZE 0x1000 /* Size of a core MMIO area */
-@@ -452,5 +454,41 @@ enum {
+@@ -453,5 +455,41 @@ enum {
#define SSB_ADM_BASE2 0xFFFF0000 /* Type2 base address for the core */
#define SSB_ADM_BASE2_SHIFT 16