more pci fixes

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@862 3c298f89-4303-0410-b956-a3cf2f4a3e73

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 2841519..538dea5 100644 (file)
--- 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.
         */
         * 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;
 
            (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 5e41b87..9259028 100644 (file)
--- 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        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        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 */
 
 
 #define        SDIOH_FPGA_ID           0x4380          /* sdio host fpga */