vserver 1.9.5.x5

[linux-2.6.git] / arch / ppc / syslib / ppc85xx_setup.c

diff --git a/arch/ppc/syslib/ppc85xx_setup.c b/arch/ppc/syslib/ppc85xx_setup.c
index d4e6515..81f1968 100644 (file)
--- a/arch/ppc/syslib/ppc85xx_setup.c
+++ b/arch/ppc/syslib/ppc85xx_setup.c
@@ -21,13 +21,14 @@
 #include <linux/serial.h>
 #include <linux/tty.h> /* for linux/serial_core.h */
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 
 #include <asm/prom.h>
 #include <asm/time.h>
 #include <asm/mpc85xx.h>
 #include <asm/immap_85xx.h>
 #include <asm/mmu.h>
-#include <asm/ocp.h>
+#include <asm/ppc_sys.h>
 #include <asm/kgdb.h>
 
 #include <syslib/ppc85xx_setup.h>
@@ -73,40 +74,39 @@ mpc85xx_calibrate_decr(void)
 void __init
 mpc85xx_early_serial_map(void)
 {
+#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
        struct uart_port serial_req;
+#endif
+       struct plat_serial8250_port *pdata;
        bd_t *binfo = (bd_t *) __res;
-       phys_addr_t duart_paddr = binfo->bi_immr_base + MPC85xx_UART0_OFFSET;
+       pdata = (struct plat_serial8250_port *) ppc_sys_get_pdata(MPC85xx_DUART);
 
        /* Setup serial port access */
+       pdata[0].uartclk = binfo->bi_busfreq;
+       pdata[0].mapbase += binfo->bi_immr_base;
+       pdata[0].membase = ioremap(pdata[0].mapbase, MPC85xx_UART0_SIZE);
+
+#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
        memset(&serial_req, 0, sizeof (serial_req));
-       serial_req.uartclk = binfo->bi_busfreq;
-       serial_req.line = 0;
-       serial_req.irq = MPC85xx_IRQ_DUART;
-       serial_req.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
        serial_req.iotype = SERIAL_IO_MEM;
-       serial_req.membase = ioremap(duart_paddr, MPC85xx_UART0_SIZE);
-       serial_req.mapbase = duart_paddr;
+       serial_req.mapbase = pdata[0].mapbase;
+       serial_req.membase = pdata[0].membase;
        serial_req.regshift = 0;
 
-#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
        gen550_init(0, &serial_req);
 #endif
 
-       if (early_serial_setup(&serial_req) != 0)
-               printk("Early serial init of port 0 failed\n");
-
-       /* Assume early_serial_setup() doesn't modify serial_req */
-       duart_paddr = binfo->bi_immr_base + MPC85xx_UART1_OFFSET;
-       serial_req.line = 1;
-       serial_req.mapbase = duart_paddr;
-       serial_req.membase = ioremap(duart_paddr, MPC85xx_UART1_SIZE);
+       pdata[1].uartclk = binfo->bi_busfreq;
+       pdata[1].mapbase += binfo->bi_immr_base;
+       pdata[1].membase = ioremap(pdata[1].mapbase, MPC85xx_UART0_SIZE);
 
 #if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
+       /* Assume gen550_init() doesn't modify serial_req */
+       serial_req.mapbase = pdata[1].mapbase;
+       serial_req.membase = pdata[1].membase;
+
        gen550_init(1, &serial_req);
 #endif
-
-       if (early_serial_setup(&serial_req) != 0)
-               printk("Early serial init of port 1 failed\n");
 }
 #endif
 
@@ -243,6 +243,8 @@ mpc85xx_setup_pci2(struct pci_controller *hose)
 }
 #endif /* CONFIG_85xx_PCI2 */
 
+int mpc85xx_pci1_last_busno = 0;
+
 void __init
 mpc85xx_setup_hose(void)
 {
@@ -341,6 +343,9 @@ mpc85xx_setup_hose(void)
                        IORESOURCE_IO, "PCI2 host bridge");
 
        hose_b->last_busno = pciauto_bus_scan(hose_b, hose_b->first_busno);
+
+       /* let board code know what the last bus number was on PCI1 */
+       mpc85xx_pci1_last_busno = hose_a->last_busno;
 #endif
        return;
 }