Asorted fixes.

4 files changed, 25 insertions, 15 deletions

diff --git a/arch/mips/config.in b/arch/mips/config.in
index 4484bd651..f5f8b7a44 100644
--- a/arch/mips/config.in
+++ b/arch/mips/config.in
@@ -100,13 +100,11 @@ fi
 if [ "$CONFIG_MIPS_MAGNUM_4000" = "y" -o \
      "$CONFIG_OLIVETTI_M700" = "y" ]; then
    define_bool CONFIG_ARC32 y
-   define_bool CONFIG_BOARD_SCACHE y
    define_bool CONFIG_I8259 y
    define_bool CONFIG_ISA y
    define_bool CONFIG_FB y
    define_bool CONFIG_FB_G364 y	
    define_bool CONFIG_MIPS_JAZZ y
-   define_bool CONFIG_ROTTEN_IRQ y
    define_bool CONFIG_PC_KEYB y
 fi
 if [ "$CONFIG_ACER_PICA_61" = "y" ]; then
@@ -152,6 +150,7 @@ if [ "$CONFIG_DDB5074" = "y" -o "$CONFIG_DDB5476"  = "y" ]; then
    define_bool CONFIG_PCI y
    define_bool CONFIG_PC_KEYB y
    define_bool CONFIG_ROTTEN_IRQ y
+   define_bool CONFIG_HAVE_STD_PC_SERIAL_PORT y
 fi
 if [ "$CONFIG_MIPS_ITE8172" = "y" ]; then
    define_bool CONFIG_PCI y
diff --git a/arch/mips/ddb5476/pci.c b/arch/mips/ddb5476/pci.c
index 0bd7132ed..c31113c58 100644
--- a/arch/mips/ddb5476/pci.c
+++ b/arch/mips/ddb5476/pci.c
@@ -246,9 +246,24 @@ static void __init ddb5476_pci_fixup(void)
 			 * first memory bank. Unfortunately the address is
 			 * wrong, so we fix it (again).
 			 */
+
+			/* [jsun] We cannot request the resource anymore,
+			 * because kernel/setup.c has already reserved "System 
+			 * RAM" resource at the same spot.  
+			 * The fundamental problem here is that PCI host 
+			 * controller should not put system RAM mapping in BAR
+			 * and make subject to PCI resource assignement.
+			 * Current fix is a total hack.  We set parent to 1 so
+                         * so that PCI resource assignement code is fooled to 
+                         * think the resource is assigned, and will not attempt
+                         * to mess with it.
+			 */
 			dev->resource[2] = ddb5476_resources.ram;
-			request_resource(&iomem_resource,
-					 &dev->resource[2]);
+			if (request_resource(&iomem_resource,
+			                     &dev->resource[2]) ) {
+				dev->resource[2].parent = 0x1;
+                        }
+
 		} else if (dev->vendor == PCI_VENDOR_ID_AL
 			   && dev->device == PCI_DEVICE_ID_AL_M7101) {
 			/*
@@ -326,8 +341,6 @@ static void __init pcibios_fixup_irqs(void)
 
 void __init pcibios_init(void)
 {
-	u32 base;
-
 	printk("PCI: Emulate bios initialization \n");
 	/* [jsun] we need to set BAR0 so that SDRAM 0 appears at 0x0 in PCI */
 	*(long *) (NILE4_BASE + NILE4_BAR0) = 0x8;
diff --git a/arch/mips/gt64120/momenco_ocelot/pci.c b/arch/mips/gt64120/momenco_ocelot/pci.c
index 0c1d0a7b0..04727f885 100644
--- a/arch/mips/gt64120/momenco_ocelot/pci.c
+++ b/arch/mips/gt64120/momenco_ocelot/pci.c
@@ -35,7 +35,7 @@ void __init gt64120_board_pcibios_fixup_bus(struct pci_bus *bus)
 			/*
 			 * Slot 1 is primary ether port, i82559
 			 * we double-check against that assumption
-			 /
+			 */
 			if ((devices->vendor != 0x8086) ||
 			    (devices->device != 0x1209) ) {
 				panic("gt64120_board_pcibios_fixup_bus: found "
@@ -55,7 +55,7 @@ void __init gt64120_board_pcibios_fixup_bus(struct pci_bus *bus)
 			devices->irq = 3;       /* irq_nr is 3 for INT1 */
 		} else {
 			/* We don't have assign interrupts for other devices. */
-			devices->irq = 0;       /* irq_nr is 3 for INT1 */
+			devices->irq = 0xff;
 		}
 
 		/* Assign an interrupt number for the device */
diff --git a/arch/mips/mm/loadmmu.c b/arch/mips/mm/loadmmu.c
index 2c5e2e9d6..5bdcb38ab 100644
--- a/arch/mips/mm/loadmmu.c
+++ b/arch/mips/mm/loadmmu.c
@@ -60,6 +60,11 @@ void __init loadmmu(void)
                printk("Loading RM7000 MMU routines.\n");
                ld_mmu_rm7k();
 #endif
+#if defined(CONFIG_CPU_R5432)
+		printk("Loading R5432 MMU routines.\n");
+		ld_mmu_r5432();
+#endif
+
 #if defined(CONFIG_CPU_MIPS32)
 		printk("Loading MIPS32 MMU routines.\n");
 		ld_mmu_mips32();
@@ -81,13 +86,6 @@ void __init loadmmu(void)
 		break;
 #endif
 
-#if defined(CONFIG_CPU_R5432)
-	case CPU_R5432:
-		printk("Loading R5432 MMU routines.\n");
-		ld_mmu_r5432();
-		break;
-#endif
-
 #ifdef CONFIG_CPU_R10000
 	case CPU_R10000:
 		printk("Loading R10000 MMU routines.\n");