Changeset 9281


Ignore:
Timestamp:
2007-10-13T04:21:24+02:00 (10 years ago)
Author:
nbd
Message:

back out change to generic-2.6/files/ and update 310-ssb_pcicore_fixes.patch for 2.6.23

Location:
trunk/target/linux/generic-2.6
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic-2.6/files/drivers/ssb/driver_pcicore.c

    r9279 r9281  
    9494        /* Enable PCI bridge BAR1 prefetch and burst */ 
    9595        pci_write_config_dword(dev, SSB_BAR1_CONTROL, 3); 
    96  
    97         /* Make sure our latency is high enough to handle the devices behind us */ 
    98         pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0xa8); 
    9996} 
    10097DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, ssb_fixup_pcibridge); 
    10198 
    102 int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) 
     99int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 
    103100{ 
    104101        return ssb_mips_irq(extpci_core->dev) + 2; 
     
    114111        if (unlikely(pc->cardbusmode && dev > 1)) 
    115112                goto out; 
    116         if (bus == 0) {//FIXME busnumber ok? 
     113        if (bus == 0) { 
    117114                /* Type 0 transaction */ 
    118115                if (unlikely(dev >= SSB_PCI_SLOT_MAX)) 
     
    228225                break; 
    229226        } 
    230         writel(val, mmio); 
     227        writel(*((const u32 *)buf), mmio); 
    231228 
    232229        err = 0; 
     
    311308        val |= SSB_PCICORE_CTL_RST; /* Deassert RST# */ 
    312309        pcicore_write32(pc, SSB_PCICORE_CTL, val); 
    313         val = SSB_PCICORE_ARBCTL_INTERN; 
    314         pcicore_write32(pc, SSB_PCICORE_ARBCTL, val);  
    315310        udelay(1); 
    316311 
     
    342337         * to non-MIPS platform. */ 
    343338        set_io_port_base((unsigned long)ioremap_nocache(SSB_PCI_MEM, 0x04000000)); 
    344         mdelay(300); 
    345339        register_pci_controller(&ssb_pcicore_controller); 
    346340} 
  • trunk/target/linux/generic-2.6/patches-2.6.23/310-ssb_pcicore_fixes.patch

    r9114 r9281  
    1 Index: linux-2.6.23-rc6/drivers/ssb/driver_pcicore.c 
     1Index: linux-2.6.23/drivers/ssb/driver_pcicore.c 
    22=================================================================== 
    3 --- linux-2.6.23-rc6.orig/drivers/ssb/driver_pcicore.c  2007-09-21 16:23:52.000000000 +0800 
    4 +++ linux-2.6.23-rc6/drivers/ssb/driver_pcicore.c       2007-09-21 16:24:08.000000000 +0800 
    5 @@ -93,6 +93,9 @@ 
     3--- linux-2.6.23.orig/drivers/ssb/driver_pcicore.c      2007-10-13 04:20:23.235499369 +0200 
     4+++ linux-2.6.23/drivers/ssb/driver_pcicore.c   2007-10-13 04:21:28.895241103 +0200 
     5@@ -93,10 +93,13 @@ 
    66  
    77        /* Enable PCI bridge BAR1 prefetch and burst */ 
     
    1313 DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, ssb_fixup_pcibridge); 
    1414  
     15-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 
     16+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) 
     17 { 
     18        return ssb_mips_irq(extpci_core->dev) + 2; 
     19 } 
    1520@@ -110,7 +113,7 @@ 
    1621  
     
    3641        pcicore_write32(pc, SSB_PCICORE_CTL, val); 
    3742+       val = SSB_PCICORE_ARBCTL_INTERN; 
    38 +       pcicore_write32(pc, SSB_PCICORE_ARBCTL, val);  
     43+       pcicore_write32(pc, SSB_PCICORE_ARBCTL, val); 
    3944        udelay(1); 
    4045  
Note: See TracChangeset for help on using the changeset viewer.