linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/arch/ppc/syslib/mpc52xx_setup.c b/arch/ppc/syslib/mpc52xx_setup.c
index 80c6090..a4a4b02 100644 (file)
--- a/arch/ppc/syslib/mpc52xx_setup.c
+++ b/arch/ppc/syslib/mpc52xx_setup.c
@@ -1,4 +1,6 @@
 /*
+ * arch/ppc/syslib/mpc52xx_setup.c
+ *
  * Common code for the boards based on Freescale MPC52xx embedded CPU.
  *
  * 
@@ -15,6 +17,7 @@
  * kind, whether express or implied.
  */
 
+#include <linux/config.h>
 
 #include <asm/io.h>
 #include <asm/time.h>
@@ -23,8 +26,6 @@
 #include <asm/pgtable.h>
 #include <asm/ppcboot.h>
 
-#include <syslib/mpc52xx_pci.h>
-
 extern bd_t __res;
 
 static int core_mult[] = {             /* CPU Frequency multiplier, taken    */
@@ -217,52 +218,6 @@ mpc52xx_calibrate_decr(void)
        tb_to_us = mulhwu_scale_factor(xlbfreq / divisor, 1000000);
 }
 
-
-void __init
-mpc52xx_setup_cpu(void)
-{
-       struct mpc52xx_cdm  __iomem *cdm;
-       struct mpc52xx_xlb  __iomem *xlb;
-
-       /* Map zones */
-       cdm  = ioremap(MPC52xx_PA(MPC52xx_CDM_OFFSET), MPC52xx_CDM_SIZE);
-       xlb  = ioremap(MPC52xx_PA(MPC52xx_XLB_OFFSET), MPC52xx_XLB_SIZE);
-
-       if (!cdm || !xlb) {
-               printk(KERN_ERR __FILE__ ": "
-                       "Error while mapping CDM/XLB during "
-                       "mpc52xx_setup_cpu\n");
-               goto unmap_regs;
-       }
-
-       /* Use internal 48 Mhz */
-       out_8(&cdm->ext_48mhz_en, 0x00);
-       out_8(&cdm->fd_enable, 0x01);
-       if (in_be32(&cdm->rstcfg) & 0x40)       /* Assumes 33Mhz clock */
-               out_be16(&cdm->fd_counters, 0x0001);
-       else
-               out_be16(&cdm->fd_counters, 0x5555);
-
-       /* Configure the XLB Arbiter priorities */
-       out_be32(&xlb->master_pri_enable, 0xff);
-       out_be32(&xlb->master_priority, 0x11111111);
-
-       /* Enable ram snooping for 1GB window */
-       out_be32(&xlb->config, in_be32(&xlb->config) | MPC52xx_XLB_CFG_SNOOP);
-       out_be32(&xlb->snoop_window, MPC52xx_PCI_TARGET_MEM | 0x1d);
-
-       /* Disable XLB pipelining */
-       /* (cfr errate 292. We could do this only just before ATA PIO
-           transaction and re-enable it after ...) */
-       out_be32(&xlb->config, in_be32(&xlb->config) | MPC52xx_XLB_CFG_PLDIS);
-
-       /* Unmap reg zone */
-unmap_regs:
-       if (cdm)  iounmap(cdm);
-       if (xlb)  iounmap(xlb);
-}
-
-
 int mpc52xx_match_psc_function(int psc_idx, const char *func)
 {
        struct mpc52xx_psc_func *cf = mpc52xx_psc_functions;