MIPS: Whitespace cleanup.

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / mips / pci / fixup-sni.c

diff --git a/arch/mips/pci/fixup-sni.c b/arch/mips/pci/fixup-sni.c
index 0c9a4732d45506d3495192efbee8029b08575d0b..f67ebeeb42000bb5d4d73961d6bcc4d632375298 100644 (file)
--- a/arch/mips/pci/fixup-sni.c
+++ b/arch/mips/pci/fixup-sni.c
@@ -14,6 +14,8 @@
 #include <asm/mipsregs.h>
 #include <asm/sni.h>
 
+#include <irq.h>
+
 /*
  * PCIMT Shortcuts ...
  */
@@ -39,12 +41,12 @@
  * Logic CL-GD5434 VGA is device 3.
  */
 static char irq_tab_rm200[8][5] __initdata = {
-       /*       INTA  INTB  INTC  INTD */
-       {     0,    0,    0,    0,    0 },      /* EISA bridge */
+       /*       INTA  INTB  INTC  INTD */
+       {     0,    0,    0,    0,    0 },      /* EISA bridge */
        {  SCSI, SCSI, SCSI, SCSI, SCSI },      /* SCSI */
-       {   ETH,  ETH,  ETH,  ETH,  ETH },      /* Ethernet */
+       {   ETH,  ETH,  ETH,  ETH,  ETH },      /* Ethernet */
        {  INTB, INTB, INTB, INTB, INTB },      /* VGA */
-       {     0,    0,    0,    0,    0 },      /* Unused */
+       {     0,    0,    0,    0,    0 },      /* Unused */
        {     0, INTB, INTC, INTD, INTA },      /* Slot 2 */
        {     0, INTC, INTD, INTA, INTB },      /* Slot 3 */
        {     0, INTD, INTA, INTB, INTC },      /* Slot 4 */
@@ -56,20 +58,20 @@ static char irq_tab_rm200[8][5] __initdata = {
  * The VGA card is optional for RM300 systems.
  */
 static char irq_tab_rm300d[8][5] __initdata = {
-       /*       INTA  INTB  INTC  INTD */
-       {     0,    0,    0,    0,    0 },      /* EISA bridge */
+       /*       INTA  INTB  INTC  INTD */
+       {     0,    0,    0,    0,    0 },      /* EISA bridge */
        {  SCSI, SCSI, SCSI, SCSI, SCSI },      /* SCSI */
        {     0, INTC, INTD, INTA, INTB },      /* Slot 1 */
        {  INTB, INTB, INTB, INTB, INTB },      /* VGA */
-       {     0,    0,    0,    0,    0 },      /* Unused */
+       {     0,    0,    0,    0,    0 },      /* Unused */
        {     0, INTB, INTC, INTD, INTA },      /* Slot 2 */
        {     0, INTC, INTD, INTA, INTB },      /* Slot 3 */
        {     0, INTD, INTA, INTB, INTC },      /* Slot 4 */
 };
 
 static char irq_tab_rm300e[5][5] __initdata = {
-       /*       INTA  INTB  INTC  INTD */
-       {     0,    0,    0,    0,    0 },      /* HOST bridge */
+       /*       INTA  INTB  INTC  INTD */
+       {     0,    0,    0,    0,    0 },      /* HOST bridge */
        {  SCSI, SCSI, SCSI, SCSI, SCSI },      /* SCSI */
        {     0, INTC, INTD, INTA, INTB },      /* Bridge/i960 */
        {     0, INTD, INTA, INTB, INTC },      /* Slot 1 */
@@ -95,20 +97,30 @@ static char irq_tab_rm300e[5][5] __initdata = {
 #define INTD   PCIT_IRQ_INTD
 
 static char irq_tab_pcit[13][5] __initdata = {
-       /*       INTA  INTB  INTC  INTD */
-       {     0,     0,     0,     0,     0 },  /* HOST bridge */
+       /*       INTA  INTB  INTC  INTD */
+       {     0,     0,     0,     0,     0 },  /* HOST bridge */
        { SCSI0, SCSI0, SCSI0, SCSI0, SCSI0 },  /* SCSI */
        { SCSI1, SCSI1, SCSI1, SCSI1, SCSI1 },  /* SCSI */
-       {   ETH,   ETH,   ETH,   ETH,   ETH },  /* Ethernet */
-       {     0,  INTA,  INTB,  INTC,  INTD },  /* PCI-PCI bridge */
-       {     0,     0,     0,     0,     0 },  /* Unused */
-       {     0,     0,     0,     0,     0 },  /* Unused */
-       {     0,     0,     0,     0,     0 },  /* Unused */
-       {     0,  INTA,  INTB,  INTC,  INTD },  /* Slot 1 */
-       {     0,  INTB,  INTC,  INTD,  INTA },  /* Slot 2 */
-       {     0,  INTC,  INTD,  INTA,  INTB },  /* Slot 3 */
-       {     0,  INTD,  INTA,  INTB,  INTC },  /* Slot 4 */
-       {     0,  INTA,  INTB,  INTC,  INTD },  /* Slot 5 */
+       {   ETH,   ETH,   ETH,   ETH,   ETH },  /* Ethernet */
+       {     0,  INTA,  INTB,  INTC,  INTD },  /* PCI-PCI bridge */
+       {     0,     0,     0,     0,     0 },  /* Unused */
+       {     0,     0,     0,     0,     0 },  /* Unused */
+       {     0,     0,     0,     0,     0 },  /* Unused */
+       {     0,  INTA,  INTB,  INTC,  INTD },  /* Slot 1 */
+       {     0,  INTB,  INTC,  INTD,  INTA },  /* Slot 2 */
+       {     0,  INTC,  INTD,  INTA,  INTB },  /* Slot 3 */
+       {     0,  INTD,  INTA,  INTB,  INTC },  /* Slot 4 */
+       {     0,  INTA,  INTB,  INTC,  INTD },  /* Slot 5 */
+};
+
+static char irq_tab_pcit_cplus[13][5] __initdata = {
+       /*       INTA  INTB  INTC  INTD */
+       {     0,     0,     0,     0,     0 },  /* HOST bridge */
+       {     0,  INTB,  INTC,  INTD,  INTA },  /* PCI Slot 9 */
+       {     0,     0,     0,     0,     0 },  /* PCI-EISA */
+       {     0,     0,     0,     0,     0 },  /* Unused */
+       {     0,  INTA,  INTB,  INTC,  INTD },  /* PCI-PCI bridge */
+       {     0,  INTB,  INTC,  INTD,  INTA },  /* fixup */
 };
 
 static inline int is_rm300_revd(void)
@@ -118,23 +130,34 @@ static inline int is_rm300_revd(void)
        return (csmsr & 0xa0) == 0x20;
 }
 
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        switch (sni_brd_type) {
-       case SNI_BRD_PCI_TOWER:
        case SNI_BRD_PCI_TOWER_CPLUS:
-               return irq_tab_pcit[slot][pin];
+               if (slot == 4) {
+                       /*
+                        * SNI messed up interrupt wiring for onboard
+                        * PCI bus 1; we need to fix this up here
+                        */
+                       while (dev && dev->bus->number != 1)
+                               dev = dev->bus->self;
+                       if (dev && dev->devfn >= PCI_DEVFN(4, 0))
+                               slot = 5;
+               }
+               return irq_tab_pcit_cplus[slot][pin];
+       case SNI_BRD_PCI_TOWER:
+               return irq_tab_pcit[slot][pin];
 
        case SNI_BRD_PCI_MTOWER:
-               if (is_rm300_revd())
-                       return irq_tab_rm300d[slot][pin];
-               /* fall through */
+               if (is_rm300_revd())
+                       return irq_tab_rm300d[slot][pin];
+               /* fall through */
 
        case SNI_BRD_PCI_DESKTOP:
-               return irq_tab_rm200[slot][pin];
+               return irq_tab_rm200[slot][pin];
 
        case SNI_BRD_PCI_MTOWER_CPLUS:
-               return irq_tab_rm300e[slot][pin];
+               return irq_tab_rm300e[slot][pin];
        }
 
        return 0;