diff options
| author | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-05-13 00:35:33 +0000 |
|---|---|---|
| committer | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-05-13 00:35:33 +0000 |
| commit | 8561def699ea8fc6d9392fd846ccaf6a11a60cc4 (patch) | |
| tree | 62cbc9268b9812b2d7da9a7a33a060b5ca699a6b /package/linux/kernel-source | |
| parent | e55415fe5f6fb1a4505e7379677274effff31630 (diff) | |
more pci fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@862 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/linux/kernel-source')
| -rw-r--r-- | package/linux/kernel-source/arch/mips/brcm-boards/bcm947xx/sbpci.c | 4 | ||||
| -rw-r--r-- | package/linux/kernel-source/include/bcmdevs.h | 2 |
2 files changed, 5 insertions, 1 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 284151935..538dea57b 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 @@ -282,7 +282,9 @@ sbpci_init(void *sbh) * PCI is bonded out, some boards may leave the pins * floating. */ - if (((chip == BCM4712_DEVICE_ID) && (chippkg == BCM4712SMALL_PKG_ID)) || + if (((chip == BCM4712_DEVICE_ID) && + ((chippkg == BCM4712SMALL_PKG_ID) || + (chippkg == BCM4712MID_PKG_ID))) || (boardflags & BFL_NOPCI)) pci_disabled = TRUE; diff --git a/package/linux/kernel-source/include/bcmdevs.h b/package/linux/kernel-source/include/bcmdevs.h index 5e41b87c8..92590287c 100644 --- a/package/linux/kernel-source/include/bcmdevs.h +++ b/package/linux/kernel-source/include/bcmdevs.h @@ -98,7 +98,9 @@ #define BCM4712_DEVICE_ID 0x4712 /* 4712 chipcommon chipid */ #define BCM4712_MIPS_ID 0x4720 /* 4712 base devid */ +#define BCM4712LARGE_PKG_ID 0 /* 340pin 4712 package id */ #define BCM4712SMALL_PKG_ID 1 /* 200pin 4712 package id */ +#define BCM4712MID_PKG_ID 2 /* 225pin 4712 package id */ #define SDIOH_FPGA_ID 0x4380 /* sdio host fpga */ |