Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[linux-2.6] / arch / ppc / platforms / 4xx / ocotea.c

diff --git a/arch/ppc/platforms/4xx/ocotea.c b/arch/ppc/platforms/4xx/ocotea.c
index 84e999d9a7bb950494675f6f09dd49c25ed6ffff..308386ef6f771143d6744f25671fc17f96ebb0b1 100644 (file)
--- a/arch/ppc/platforms/4xx/ocotea.c
+++ b/arch/ppc/platforms/4xx/ocotea.c
@@ -23,13 +23,13 @@
 #include <linux/blkdev.h>
 #include <linux/console.h>
 #include <linux/delay.h>
-#include <linux/ide.h>
 #include <linux/initrd.h>
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 #include <linux/tty.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 
 #include <asm/system.h>
 #include <asm/pgtable.h>
@@ -178,7 +178,7 @@ ocotea_setup_pcix(void)
        /* Setup 2GB PCI->PLB inbound memory window at 0, enable MSIs */
        PCIX_WRITEL(0x00000000, PCIX0_PIM0LAH);
        PCIX_WRITEL(0x00000000, PCIX0_PIM0LAL);
-       PCIX_WRITEL(0xe0000007, PCIX0_PIM0SA);
+       PCIX_WRITEL(0x80000007, PCIX0_PIM0SA);
 
        eieio();
 }
@@ -258,7 +258,7 @@ ocotea_early_serial_map(void)
        gen550_init(0, &port);
 
        /* Purge TLB entry added in head_44x.S for early serial access */
-       _tlbie(UART0_IO_BASE);
+       _tlbie(UART0_IO_BASE, 0);
 #endif
 
        port.membase = ioremap64(PPC440GX_UART1_ADDR, 8);
@@ -289,7 +289,7 @@ ocotea_setup_arch(void)
         * from FPGA, because it can be changed by on-board switches
         * --ebs
         */
-       ibm440gx_get_clocks(&clocks, 33333333, 6 * 1843200);
+       ibm440gx_get_clocks(&clocks, 33300000, 6 * 1843200);
        ocp_sys_info.opb_bus_freq = clocks.opb;
 
        /* Setup TODC access */