Merge with /home/wd/git/u-boot/custodian/u-boot-arm

[karo-tx-uboot.git] / cpu / mpc5xxx / speed.c

diff --git a/cpu/mpc5xxx/speed.c b/cpu/mpc5xxx/speed.c
index cb27779a2290bbc311d81d2bcbbcecc2022dbe9e..7847adcefa40f4258e0e846ff7ed4d1f143b38d6 100644 (file)
--- a/cpu/mpc5xxx/speed.c
+++ b/cpu/mpc5xxx/speed.c
@@ -25,15 +25,17 @@
 #include <mpc5xxx.h>
 #include <asm/processor.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 /* ------------------------------------------------------------------------- */
 
 /* Bus-to-Core Multipliers */
 
 static int bus2core[] = {
-       0,  0,  0,  10, 20, 20, 25, 45,
-       30, 55, 40, 50, 0,  60, 35, 0,
-       30, 25, 65, 10, 70, 20, 75, 45,
-       0,  55, 40, 50, 80, 60, 35, 0
+       3, 2, 2, 2, 4, 4, 5, 9,
+       6, 11, 8, 10, 3, 12, 7, 0,
+       6, 5, 13, 2, 14, 4, 15, 9,
+       0, 11, 8, 10, 16, 12, 7, 0
 };
 /* ------------------------------------------------------------------------- */
 
@@ -43,8 +45,6 @@ static int bus2core[] = {
 
 int get_clocks (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        ulong val, vco;
 
 #if !defined(CFG_MPC5XXX_CLKIN)
@@ -62,7 +62,7 @@ int get_clocks (void)
        } else {
                gd->bus_clk = vco / 4;
        }
-       gd->cpu_clk = gd->bus_clk * bus2core[val & 0x1f] / 10;
+       gd->cpu_clk = gd->bus_clk * bus2core[val & 0x1f] / 2;
 
        val = *(vu_long *)MPC5XXX_CDM_CFG;
        if (val & (1 << 8)) {
@@ -81,8 +81,6 @@ int get_clocks (void)
 
 int prt_mpc5xxx_clks (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        printf("       Bus %ld MHz, IPB %ld MHz, PCI %ld MHz\n",
                        gd->bus_clk / 1000000, gd->ipb_clk / 1000000,
                        gd->pci_clk / 1000000);