Changeset 815


Ignore:
Timestamp:
2005-05-09T00:01:18+02:00 (13 years ago)
Author:
mbm
Message:

pci fixup

Location:
trunk/openwrt/package/linux/kernel-source
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/package/linux/kernel-source/arch/mips/brcm-boards/bcm947xx/sbpci.c

    r390 r815  
    246246                pci_ban[pci_banned++] = core; 
    247247} 
    248 //#define CT4712_WR         1   /* Workaround for 4712 */ 
    249248 
    250249int __init 
     
    258257        void *regs; 
    259258        char varname[8]; 
    260         int CT4712_WR; 
    261259        uint wlidx = 0; 
    262260        uint16 vendor, core; 
     
    275273        sb_core_reset(sbh, 0); 
    276274 
    277         /* In some board, */  
    278         if(nvram_match("boardtype", "bcm94710dev") || nvram_match("boardtype", "bcm94710ap")|| nvram_match("boardtype", "bcm94710r4")|| nvram_match("boardtype", "bcm94710r4")|| nvram_match("boardtype", "bcm95365r")) 
    279                 CT4712_WR = 0; 
    280         else 
    281                 CT4712_WR = 1; 
    282  
    283275        boardflags = (uint32) getintvar(NULL, "boardflags"); 
    284276 
     
    292284         */ 
    293285        if (((chip == BCM4712_DEVICE_ID) && (chippkg == BCM4712SMALL_PKG_ID)) || 
    294             (boardflags & BFL_NOPCI) || CT4712_WR) 
     286            (boardflags & BFL_NOPCI)) 
    295287                pci_disabled = TRUE; 
    296288 
  • trunk/openwrt/package/linux/kernel-source/drivers/net/hnd/sbutils.c

    r764 r815  
    235235                regs = (uint32 *)REG_MAP(SB_ENUM_BASE, SB_CORE_SIZE); 
    236236                cid = R_REG((uint32 *)regs); 
    237                 if (((cid & CID_ID_MASK) == 0x4712) && 
     237                if (((cid & (CID_ID_MASK | CID_PKG_MASK)) == 0x00104712) && 
    238238                    ((cid & CID_REV_MASK) <= 0x00020000)) { 
    239239                        uint32 *scc, val; 
Note: See TracChangeset for help on using the changeset viewer.