X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fppc%2Fplatforms%2F4xx%2Focotea.c;h=c981f70aad5f53668920b497ca4ddc5b61e5af82;hb=44c40f29869a02dd430beb7fed0b6ca7d8ef5e54;hp=6b3036fb767731d43e69ab7432a2ae987fe85eb6;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git

diff --git a/arch/ppc/platforms/4xx/ocotea.c b/arch/ppc/platforms/4xx/ocotea.c
index 6b3036fb7..c981f70aa 100644
--- a/arch/ppc/platforms/4xx/ocotea.c
+++ b/arch/ppc/platforms/4xx/ocotea.c
@@ -1,11 +1,11 @@
 /*
- * arch/ppc/platforms/4xx/ocotea.c
+ * arch/ppc/platforms/ocotea.c
  *
  * Ocotea board specific routines
  *
- * Matt Porter <mporter@kernel.crashing.org>
+ * Matt Porter <mporter@mvista.com>
  *
- * Copyright 2003-2004 MontaVista Software Inc.
+ * Copyright 2003 MontaVista Software Inc.
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under  the terms of  the GNU General  Public License as published by the
@@ -49,7 +49,6 @@
 #include <asm/ppc4xx_pic.h>
 #include <asm/ppcboot.h>
 
-#include <syslib/gen550.h>
 #include <syslib/ibm440gx_common.h>
 
 /*
@@ -81,7 +80,7 @@ ocotea_show_cpuinfo(struct seq_file *m)
 {
 	seq_printf(m, "vendor\t\t: IBM\n");
 	seq_printf(m, "machine\t\t: PPC440GX EVB (Ocotea)\n");
-	ibm440gx_show_cpuinfo(m);
+
 	return 0;
 }
 
@@ -145,13 +144,13 @@ static void __init ocotea_set_emacdata(void)
 }
 
 #define PCIX_READW(offset) \
-	(readw(pcix_reg_base+offset))
+	(readw((u32)pcix_reg_base+offset))
 
 #define PCIX_WRITEW(value, offset) \
-	(writew(value, pcix_reg_base+offset))
+	(writew(value, (u32)pcix_reg_base+offset))
 
 #define PCIX_WRITEL(value, offset) \
-	(writel(value, pcix_reg_base+offset))
+	(writel(value, (u32)pcix_reg_base+offset))
 
 /*
  * FIXME: This is only here to "make it work".  This will move
@@ -264,11 +263,6 @@ ocotea_early_serial_map(void)
 		printk("Early serial init of port 0 failed\n");
 	}
 
-#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
-	/* Configure debug serial access */
-	gen550_init(0, &port);
-#endif
-
 	port.membase = ioremap64(PPC440GX_UART1_ADDR, 8);
 	port.irq = UART1_INT;
 	port.uartclk = clocks.uart1;
@@ -277,11 +271,6 @@ ocotea_early_serial_map(void)
 	if (early_serial_setup(&port) != 0) {
 		printk("Early serial init of port 1 failed\n");
 	}
-
-#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
-	/* Configure debug serial access */
-	gen550_init(1, &port);
-#endif
 }
 
 static void __init
@@ -291,6 +280,23 @@ ocotea_setup_arch(void)
 
 	ibm440gx_tah_enable();
 
+#if !defined(CONFIG_BDI_SWITCH)
+	/*
+	 * The Abatron BDI JTAG debugger does not tolerate others
+	 * mucking with the debug registers.
+	 */
+        mtspr(SPRN_DBCR0, (DBCR0_TDE | DBCR0_IDM));
+#endif
+
+	/*
+	 * Determine various clocks.
+	 * To be completely correct we should get SysClk
+	 * from FPGA, because it can be changed by on-board switches
+	 * --ebs
+	 */
+	ibm440gx_get_clocks(&clocks, 33333333, 6 * 1843200);
+	ocp_sys_info.opb_bus_freq = clocks.opb;
+
 	/* Setup TODC access */
 	TODC_INIT(TODC_TYPE_DS1743,
 			0,
@@ -321,11 +327,6 @@ ocotea_setup_arch(void)
 	printk("IBM Ocotea port (MontaVista Software, Inc. <source@mvista.com>)\n");
 }
 
-static void __init ocotea_init(void)
-{
-	ibm440gx_l2c_setup(&clocks);
-}
-
 void __init platform_init(unsigned long r3, unsigned long r4,
 		unsigned long r5, unsigned long r6, unsigned long r7)
 {
@@ -338,20 +339,8 @@ void __init platform_init(unsigned long r3, unsigned long r4,
 	if (r3)
 		__res = *(bd_t *)(r3 + KERNELBASE);
 
-	/*
-	 * Determine various clocks.
-	 * To be completely correct we should get SysClk
-	 * from FPGA, because it can be changed by on-board switches
-	 * --ebs
-	 */
-	ibm440gx_get_clocks(&clocks, 33333333, 6 * 1843200);
-	ocp_sys_info.opb_bus_freq = clocks.opb;
-
-	/* XXX Fix L2C IRQ triggerring setting (edge-sensitive).
-	 * Firmware (at least PIBS v1.72 OCT/28/2003) sets it incorrectly
-	 * --ebs
-	 */
-	mtdcr(DCRN_UIC_TR(UIC2), mfdcr(DCRN_UIC_TR(UIC2)) | 0x00000100);
+	/* Disable L2-Cache due to hardware issues */
+	ibm440gx_l2c_disable();
 
 	ibm44x_platform_init();
 
@@ -366,8 +355,8 @@ void __init platform_init(unsigned long r3, unsigned long r4,
 
 	ppc_md.nvram_read_val = todc_direct_read_val;
 	ppc_md.nvram_write_val = todc_direct_write_val;
+
 #ifdef CONFIG_KGDB
 	ppc_md.early_serial_map = ocotea_early_serial_map;
 #endif
-	ppc_md.init = ocotea_init;
 }