1 files changed, 26 insertions, 93 deletions
diff --git a/arch/mips/pci/fixup-rbtx4927.c b/arch/mips/pci/fixup-rbtx4927.c
index 7450c335b387..321db265829c 100644
--- a/arch/mips/pci/fixup-rbtx4927.c
+++ b/arch/mips/pci/fixup-rbtx4927.c
@@ -33,108 +33,41 @@
 *  675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #include <linux/types.h>
-#include <linux/pci.h>
+#include <asm/txx9/pci.h>
-#include <linux/kernel.h>
+#include <asm/txx9/rbtx4927.h>
-#include <linux/init.h>
-#include <asm/tx4927/tx4927.h>
+int __init rbtx4927_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-#include <asm/tx4927/tx4927_pci.h>
-#undef  DEBUG
-#ifdef  DEBUG
-#define DBG(x...)       printk(x)
-#else
-#define DBG(x...)
-#endif
-/* look up table for backplane pci irq for slots 17-20 by pin # */
-static unsigned char backplane_pci_irq[4][4] = {
-        /* PJ6 SLOT:  17, PIN: 1 */ {TX4927_IRQ_IOC_PCIA,
-                                     /* PJ6 SLOT:  17, PIN: 2 */
-                                     TX4927_IRQ_IOC_PCIB,
-                                     /* PJ6 SLOT:  17, PIN: 3 */
-                                     TX4927_IRQ_IOC_PCIC,
-                                     /* PJ6 SLOT:  17, PIN: 4 */
-                                     TX4927_IRQ_IOC_PCID},
-        /* SB  SLOT:  18, PIN: 1 */ {TX4927_IRQ_IOC_PCIB,
-                                     /* SB  SLOT:  18, PIN: 2 */
-                                     TX4927_IRQ_IOC_PCIC,
-                                     /* SB  SLOT:  18, PIN: 3 */
-                                     TX4927_IRQ_IOC_PCID,
-                                     /* SB  SLOT:  18, PIN: 4 */
-                                     TX4927_IRQ_IOC_PCIA},
-        /* PJ5 SLOT:  19, PIN: 1 */ {TX4927_IRQ_IOC_PCIC,
-                                     /* PJ5 SLOT:  19, PIN: 2 */
-                                     TX4927_IRQ_IOC_PCID,
-                                     /* PJ5 SLOT:  19, PIN: 3 */
-                                     TX4927_IRQ_IOC_PCIA,
-                                     /* PJ5 SLOT:  19, PIN: 4 */
-                                     TX4927_IRQ_IOC_PCIB},
-        /* PJ4 SLOT:  20, PIN: 1 */ {TX4927_IRQ_IOC_PCID,
-                                     /* PJ4 SLOT:  20, PIN: 2 */
-                                     TX4927_IRQ_IOC_PCIA,
-                                     /* PJ4 SLOT:  20, PIN: 3 */
-                                     TX4927_IRQ_IOC_PCIB,
-                                     /* PJ4 SLOT:  20, PIN: 4 */
-                                     TX4927_IRQ_IOC_PCIC}
-};
-static int pci_get_irq(const struct pci_dev *dev, int pin)
 {
        unsigned char irq = pin;
-        DBG("pci_get_irq: pin is %d\n", pin);
        /* IRQ rotation */
        irq--;                  /* 0-3 */
-        if (dev->bus->parent == NULL &&
+        if (slot == TX4927_PCIC_IDSEL_AD_TO_SLOT(23)) {
-            PCI_SLOT(dev->devfn) == TX4927_PCIC_IDSEL_AD_TO_SLOT(23)) {
+                /* PCI CardSlot (IDSEL=A23) */
-                printk("Onboard PCI_SLOT(dev->devfn) is %d\n",
+                /* PCIA => PCIA */
-                       PCI_SLOT(dev->devfn));
+                irq = (irq + 0 + slot) % 4;
-                /* IDSEL=A23 is tx4927 onboard pci slot */
-                irq = (irq + PCI_SLOT(dev->devfn)) % 4;
-                irq++;          /* 1-4 */
-                DBG("irq is now %d\n", irq);
-                switch (irq) {
-                case 1:
-                        irq = TX4927_IRQ_IOC_PCIA;
-                        break;
-                case 2:
-                        irq = TX4927_IRQ_IOC_PCIB;
-                        break;
-                case 3:
-                        irq = TX4927_IRQ_IOC_PCIC;
-                        break;
-                case 4:
-                        irq = TX4927_IRQ_IOC_PCID;
-                        break;
-                }
        } else {
                /* PCI Backplane */
-                DBG("PCI Backplane PCI_SLOT(dev->devfn) is %d\n",
+                if (txx9_pci_option & TXX9_PCI_OPT_PICMG)
-                    PCI_SLOT(dev->devfn));
+                        irq = (irq + 33 - slot) % 4;
-                irq = backplane_pci_irq[PCI_SLOT(dev->devfn) - 17][irq];
+                else
+                        irq = (irq + 3 + slot) % 4;
        }
-        DBG("assigned irq %d\n", irq);
+        irq++;  /* 1-4 */
-        return irq;
-}
-int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-{
-        unsigned char irq;
-        printk("PCI Setup for pin %d \n", pin);
-        if (dev->device == 0x9130) /* IDE */
-                irq = 14;
-        else
-                irq = pci_get_irq(dev, pin);
+        switch (irq) {
+        case 1:
+                irq = RBTX4927_IRQ_IOC_PCIA;
+                break;
+        case 2:
+                irq = RBTX4927_IRQ_IOC_PCIB;
+                break;
+        case 3:
+                irq = RBTX4927_IRQ_IOC_PCIC;
+                break;
+        case 4:
+                irq = RBTX4927_IRQ_IOC_PCID;
+                break;
+        }
        return irq;
 }
-/* Do platform specific device initialization at pci_enable_device() time */
-int pcibios_plat_dev_init(struct pci_dev *dev)
-{
-        return 0;
-}

diff --git a/arch/mips/pci/fixup-rbtx4927.c b/arch/mips/pci/fixup-rbtx4927.c index 7450c335b387..321db265829c 100644 --- a/arch/mips/pci/fixup-rbtx4927.c +++ b/arch/mips/pci/fixup-rbtx4927.c
@@ -33,108 +33,41 @@
33	* 675 Mass Ave, Cambridge, MA 02139, USA.	33	* 675 Mass Ave, Cambridge, MA 02139, USA.
34	*/	34	*/
35	#include <linux/types.h>	35	#include <linux/types.h>
36	#include <linux/pci.h>	36	#include <asm/txx9/pci.h>
37	#include <linux/kernel.h>	37	#include <asm/txx9/rbtx4927.h>
38	#include <linux/init.h>
39		38
40	#include <asm/tx4927/tx4927.h>	39	int __init rbtx4927_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
41	#include <asm/tx4927/tx4927_pci.h>
42
43	#undef DEBUG
44	#ifdef DEBUG
45	#define DBG(x...) printk(x)
46	#else
47	#define DBG(x...)
48	#endif
49
50	/* look up table for backplane pci irq for slots 17-20 by pin # */
51	static unsigned char backplane_pci_irq[4][4] = {
52	/* PJ6 SLOT: 17, PIN: 1 */ {TX4927_IRQ_IOC_PCIA,
53	/* PJ6 SLOT: 17, PIN: 2 */
54	TX4927_IRQ_IOC_PCIB,
55	/* PJ6 SLOT: 17, PIN: 3 */
56	TX4927_IRQ_IOC_PCIC,
57	/* PJ6 SLOT: 17, PIN: 4 */
58	TX4927_IRQ_IOC_PCID},
59	/* SB SLOT: 18, PIN: 1 */ {TX4927_IRQ_IOC_PCIB,
60	/* SB SLOT: 18, PIN: 2 */
61	TX4927_IRQ_IOC_PCIC,
62	/* SB SLOT: 18, PIN: 3 */
63	TX4927_IRQ_IOC_PCID,
64	/* SB SLOT: 18, PIN: 4 */
65	TX4927_IRQ_IOC_PCIA},
66	/* PJ5 SLOT: 19, PIN: 1 */ {TX4927_IRQ_IOC_PCIC,
67	/* PJ5 SLOT: 19, PIN: 2 */
68	TX4927_IRQ_IOC_PCID,
69	/* PJ5 SLOT: 19, PIN: 3 */
70	TX4927_IRQ_IOC_PCIA,
71	/* PJ5 SLOT: 19, PIN: 4 */
72	TX4927_IRQ_IOC_PCIB},
73	/* PJ4 SLOT: 20, PIN: 1 */ {TX4927_IRQ_IOC_PCID,
74	/* PJ4 SLOT: 20, PIN: 2 */
75	TX4927_IRQ_IOC_PCIA,
76	/* PJ4 SLOT: 20, PIN: 3 */
77	TX4927_IRQ_IOC_PCIB,
78	/* PJ4 SLOT: 20, PIN: 4 */
79	TX4927_IRQ_IOC_PCIC}
80	};
81
82	static int pci_get_irq(const struct pci_dev *dev, int pin)
83	{	40	{
84	unsigned char irq = pin;	41	unsigned char irq = pin;
85		42
86	DBG("pci_get_irq: pin is %d\n", pin);
87	/* IRQ rotation */	43	/* IRQ rotation */
88	irq--; /* 0-3 */	44	irq--; /* 0-3 */
89	if (dev->bus->parent == NULL &&	45	if (slot == TX4927_PCIC_IDSEL_AD_TO_SLOT(23)) {
90	PCI_SLOT(dev->devfn) == TX4927_PCIC_IDSEL_AD_TO_SLOT(23)) {	46	/* PCI CardSlot (IDSEL=A23) */
91	printk("Onboard PCI_SLOT(dev->devfn) is %d\n",	47	/* PCIA => PCIA */
92	PCI_SLOT(dev->devfn));	48	irq = (irq + 0 + slot) % 4;
93	/* IDSEL=A23 is tx4927 onboard pci slot */
94	irq = (irq + PCI_SLOT(dev->devfn)) % 4;
95	irq++; /* 1-4 */
96	DBG("irq is now %d\n", irq);
97
98	switch (irq) {
99	case 1:
100	irq = TX4927_IRQ_IOC_PCIA;
101	break;
102	case 2:
103	irq = TX4927_IRQ_IOC_PCIB;
104	break;
105	case 3:
106	irq = TX4927_IRQ_IOC_PCIC;
107	break;
108	case 4:
109	irq = TX4927_IRQ_IOC_PCID;
110	break;
111	}
112	} else {	49	} else {
113	/* PCI Backplane */	50	/* PCI Backplane */
114	DBG("PCI Backplane PCI_SLOT(dev->devfn) is %d\n",	51	if (txx9_pci_option & TXX9_PCI_OPT_PICMG)
115	PCI_SLOT(dev->devfn));	52	irq = (irq + 33 - slot) % 4;
116	irq = backplane_pci_irq[PCI_SLOT(dev->devfn) - 17][irq];	53	else
		54	irq = (irq + 3 + slot) % 4;
117	}	55	}
118	DBG("assigned irq %d\n", irq);	56	irq++; /* 1-4 */
119	return irq;
120	}
121
122	int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
123	{
124	unsigned char irq;
125
126	printk("PCI Setup for pin %d \n", pin);
127
128	if (dev->device == 0x9130) /* IDE */
129	irq = 14;
130	else
131	irq = pci_get_irq(dev, pin);
132		57
		58	switch (irq) {
		59	case 1:
		60	irq = RBTX4927_IRQ_IOC_PCIA;
		61	break;
		62	case 2:
		63	irq = RBTX4927_IRQ_IOC_PCIB;
		64	break;
		65	case 3:
		66	irq = RBTX4927_IRQ_IOC_PCIC;
		67	break;
		68	case 4:
		69	irq = RBTX4927_IRQ_IOC_PCID;
		70	break;
		71	}
133	return irq;	72	return irq;
134	}	73	}
135
136	/* Do platform specific device initialization at pci_enable_device() time */
137	int pcibios_plat_dev_init(struct pci_dev *dev)
138	{
139	return 0;
140	}