mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-27 08:07:42 +02:00
b4fcbf1114
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20444 3c298f89-4303-0410-b956-a3cf2f4a3e73
52 lines
1.6 KiB
Diff
52 lines
1.6 KiB
Diff
--- 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);
|