vserver 1.9.5.x5

[linux-2.6.git] / arch / arm / mach-iop3xx / iop321-pci.c

diff --git a/arch/arm/mach-iop3xx/iop321-pci.c b/arch/arm/mach-iop3xx/iop321-pci.c
index 8fdfc3a..8ba6a0e 100644 (file)
--- a/arch/arm/mach-iop3xx/iop321-pci.c
+++ b/arch/arm/mach-iop3xx/iop321-pci.c
@@ -197,31 +197,24 @@ struct pci_bus *iop321_scan_bus(int nr, struct pci_sys_data *sys)
 
 void iop321_init(void)
 {
-#if CONFIG_ARCH_EP80219
-    *IOP321_ATUCR = 0x2;
-    *IOP321_OIOWTVR = 0x90000000;
-    *IOP321_IABAR0  = 0x00000004;
-    *IOP321_IABAR2  = 0xa000000c;
-    *IOP321_IALR2   = 0xe0000000;
-#endif
-
        DBG("PCI:  Intel 80321 PCI init code.\n");
-       DBG("\tATU: IOP321_ATUCMD=0x%04x\n", *IOP321_ATUCMD);
-       DBG("\tATU: IOP321_OMWTVR0=0x%04x, IOP321_OIOWTVR=0x%04x\n",
+       DBG("ATU: IOP321_ATUCMD=0x%04x\n", *IOP321_ATUCMD);
+       DBG("ATU: IOP321_OMWTVR0=0x%04x, IOP321_OIOWTVR=0x%04x\n",
                        *IOP321_OMWTVR0,
                        *IOP321_OIOWTVR);
-       DBG("\tATU: IOP321_ATUCR=0x%08x\n", *IOP321_ATUCR);
-       DBG("\tATU: IOP321_IABAR0=0x%08x IOP321_IALR0=0x%08x IOP321_IATVR0=%08x\n", *IOP321_IABAR0, *IOP321_IALR0, *IOP321_IATVR0);
-       DBG("\tATU: IOP321_ERBAR=0x%08x IOP321_ERLR=0x%08x IOP321_ERTVR=%08x\n", *IOP321_ERBAR, *IOP321_ERLR, *IOP321_ERTVR);
-       DBG("\tATU: IOP321_IABAR2=0x%08x IOP321_IALR2=0x%08x IOP321_IATVR2=%08x\n", *IOP321_IABAR2, *IOP321_IALR2, *IOP321_IATVR2);
-       DBG("\tATU: IOP321_IABAR3=0x%08x IOP321_IALR3=0x%08x IOP321_IATVR3=%08x\n", *IOP321_IABAR3, *IOP321_IALR3, *IOP321_IATVR3);
-
-#if 0
-       hook_fault_code(4, iop321_pci_abort, SIGBUS, "external abort on linefetch");
-       hook_fault_code(6, iop321_pci_abort, SIGBUS, "external abort on linefetch");
-       hook_fault_code(8, iop321_pci_abort, SIGBUS, "external abort on non-linefetch");
-       hook_fault_code(10, iop321_pci_abort, SIGBUS, "external abort on non-linefetch");
-#endif
+       DBG("ATU: IOP321_ATUCR=0x%08x\n", *IOP321_ATUCR);
+       DBG("ATU: IOP321_IABAR0=0x%08x IOP321_IALR0=0x%08x IOP321_IATVR0=%08x\n",
+                       *IOP321_IABAR0, *IOP321_IALR0, *IOP321_IATVR0);
+       DBG("ATU: IOP321_OMWTVR0=0x%08x\n", *IOP321_OMWTVR0);
+       DBG("ATU: IOP321_IABAR1=0x%08x IOP321_IALR1=0x%08x\n",
+                       *IOP321_IABAR1, *IOP321_IALR1);
+       DBG("ATU: IOP321_ERBAR=0x%08x IOP321_ERLR=0x%08x IOP321_ERTVR=%08x\n",
+                       *IOP321_ERBAR, *IOP321_ERLR, *IOP321_ERTVR);
+       DBG("ATU: IOP321_IABAR2=0x%08x IOP321_IALR2=0x%08x IOP321_IATVR2=%08x\n",
+                       *IOP321_IABAR2, *IOP321_IALR2, *IOP321_IATVR2);
+       DBG("ATU: IOP321_IABAR3=0x%08x IOP321_IALR3=0x%08x IOP321_IATVR3=%08x\n",
+                       *IOP321_IABAR3, *IOP321_IALR3, *IOP321_IATVR3);
+
        hook_fault_code(16+6, iop321_pci_abort, SIGBUS, "imprecise external abort");
 }