diff options
| author | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-05-08 22:01:18 +0000 |
|---|---|---|
| committer | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-05-08 22:01:18 +0000 |
| commit | c5916974cbca7886f11c294d310e32e65cf0d06c (patch) | |
| tree | 01ae5791eb270c83dcccd8f44ac66df72561ee83 | |
| parent | 3bb646174c79ad4f2cbcc2beef10316596cc75da (diff) | |
pci fixup
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@815 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/linux/kernel-source/arch/mips/brcm-boards/bcm947xx/sbpci.c | 10 | ||||
| -rw-r--r-- | package/linux/kernel-source/drivers/net/hnd/sbutils.c | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/package/linux/kernel-source/arch/mips/brcm-boards/bcm947xx/sbpci.c b/package/linux/kernel-source/arch/mips/brcm-boards/bcm947xx/sbpci.c index ead31e9aa..284151935 100644 --- a/package/linux/kernel-source/arch/mips/brcm-boards/bcm947xx/sbpci.c +++ b/package/linux/kernel-source/arch/mips/brcm-boards/bcm947xx/sbpci.c @@ -245,7 +245,6 @@ sbpci_ban(uint16 core) if (pci_banned < ARRAYSIZE(pci_ban)) pci_ban[pci_banned++] = core; } -//#define CT4712_WR 1 /* Workaround for 4712 */ int __init sbpci_init(void *sbh) @@ -257,7 +256,6 @@ sbpci_init(void *sbh) pci_config_regs *cfg; void *regs; char varname[8]; - int CT4712_WR; uint wlidx = 0; uint16 vendor, core; uint8 class, subclass, progif; @@ -274,12 +272,6 @@ sbpci_init(void *sbh) return -1; sb_core_reset(sbh, 0); - /* In some board, */ - if(nvram_match("boardtype", "bcm94710dev") || nvram_match("boardtype", "bcm94710ap")|| nvram_match("boardtype", "bcm94710r4")|| nvram_match("boardtype", "bcm94710r4")|| nvram_match("boardtype", "bcm95365r")) - CT4712_WR = 0; - else - CT4712_WR = 1; - boardflags = (uint32) getintvar(NULL, "boardflags"); if ((chip == BCM4310_DEVICE_ID) && (chiprev == 0)) @@ -291,7 +283,7 @@ sbpci_init(void *sbh) * floating. */ if (((chip == BCM4712_DEVICE_ID) && (chippkg == BCM4712SMALL_PKG_ID)) || - (boardflags & BFL_NOPCI) || CT4712_WR) + (boardflags & BFL_NOPCI)) pci_disabled = TRUE; /* diff --git a/package/linux/kernel-source/drivers/net/hnd/sbutils.c b/package/linux/kernel-source/drivers/net/hnd/sbutils.c index 2c9cb55c7..1b221e0b3 100644 --- a/package/linux/kernel-source/drivers/net/hnd/sbutils.c +++ b/package/linux/kernel-source/drivers/net/hnd/sbutils.c @@ -234,7 +234,7 @@ sb_kattach() regs = (uint32 *)REG_MAP(SB_ENUM_BASE, SB_CORE_SIZE); cid = R_REG((uint32 *)regs); - if (((cid & CID_ID_MASK) == 0x4712) && + if (((cid & (CID_ID_MASK | CID_PKG_MASK)) == 0x00104712) && ((cid & CID_REV_MASK) <= 0x00020000)) { uint32 *scc, val; |