From: Mike Baker Date: Fri, 13 May 2005 00:35:33 +0000 (+0000) Subject: more pci fixes X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=644a46b764bd191d5c0723b9b2c40afa4081428d;p=openwrt%2Fstaging%2Fnbd.git more pci fixes SVN-Revision: 862 --- diff --git a/openwrt/package/linux/kernel-source/arch/mips/brcm-boards/bcm947xx/sbpci.c b/openwrt/package/linux/kernel-source/arch/mips/brcm-boards/bcm947xx/sbpci.c index 2841519350..538dea57ba 100644 --- a/openwrt/package/linux/kernel-source/arch/mips/brcm-boards/bcm947xx/sbpci.c +++ b/openwrt/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/openwrt/package/linux/kernel-source/include/bcmdevs.h b/openwrt/package/linux/kernel-source/include/bcmdevs.h index 5e41b87c89..92590287cd 100644 --- a/openwrt/package/linux/kernel-source/include/bcmdevs.h +++ b/openwrt/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 */