MPC512X: Cleanup bus clock names.

Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>

diff --git a/cpu/mpc512x/fec.c b/cpu/mpc512x/fec.c
index 675b7a2e09e5475ef3d81291c145933a1801f1be..c226a8a5a20e0525057083ace34a5fcc1f7e3b44 100644 (file)
--- a/cpu/mpc512x/fec.c
+++ b/cpu/mpc512x/fec.c
@@ -299,7 +299,7 @@ int mpc512x_fec_init_phy (struct eth_device *dev, bd_t * bis)
                 * Set MII_SPEED = (1/(mii_speed * 2)) * System Clock
                 * and do not drop the Preamble.
                 */
-               fec->eth->mii_speed = (((gd->ipb_clk / 1000000) / 5) + 1) << 1;
+               fec->eth->mii_speed = (((gd->ips_clk / 1000000) / 5) + 1) << 1;
 
                /*
                 * Reset PHY, then delay 300ns

diff --git a/cpu/mpc512x/i2c.c b/cpu/mpc512x/i2c.c
index 00e28d6404dfd439fa28f2147e42cdd90855a4b3..56ba44372694ac44b2246a5ef854600b9c2c5aac 100644 (file)
--- a/cpu/mpc512x/i2c.c
+++ b/cpu/mpc512x/i2c.c
@@ -236,7 +236,7 @@ static int mpc_get_fdr (int speed)
        if (fdr == -1) {
                ulong best_speed = 0;
                ulong divider;
-               ulong ipb, scl;
+               ulong ips, scl;
                ulong bestmatch = 0xffffffffUL;
                int best_i = 0, best_j = 0, i, j;
                int SCL_Tap[] = { 9, 10, 12, 15, 5, 6, 7, 8};
@@ -251,18 +251,18 @@ static int mpc_get_fdr (int speed)
                        {126, 128}
                };
 
-               ipb = gd->ipb_clk;
+               ips = gd->ips_clk;
                for (i = 7; i >= 0; i--) {
                        for (j = 7; j >= 0; j--) {
                                scl = 2 * (scltap[j].scl2tap +
                                           (SCL_Tap[i] - 1) * scltap[j].tap2tap
                                           + 2);
-                               if (ipb <= speed*scl) {
-                                       if ((speed*scl - ipb) < bestmatch) {
-                                               bestmatch = speed*scl - ipb;
+                               if (ips <= speed*scl) {
+                                       if ((speed*scl - ips) < bestmatch) {
+                                               bestmatch = speed*scl - ips;
                                                best_i = i;
                                                best_j = j;
-                                               best_speed = ipb/scl;
+                                               best_speed = ips/scl;
                                        }
                                }
                        }

diff --git a/cpu/mpc512x/serial.c b/cpu/mpc512x/serial.c
index 200ff2c49646a8793cc598c5ac3651dd30cfc024..8a214041ad8cef18b52e2a570cb8517f17927e26 100644 (file)
--- a/cpu/mpc512x/serial.c
+++ b/cpu/mpc512x/serial.c
@@ -86,7 +86,7 @@ int serial_init(void)
        psc->mode = PSC_MODE_1_STOPBIT;
 
        /* calculate dividor for setting PSC CTUR and CTLR registers */
-       baseclk = (gd->ipb_clk + 8) / 16;
+       baseclk = (gd->ips_clk + 8) / 16;
        div = (baseclk + (gd->baudrate / 2)) / gd->baudrate;
 
        psc->ctur = (div >> 8) & 0xff;

diff --git a/cpu/mpc512x/speed.c b/cpu/mpc512x/speed.c
index a609827387b9881ad8dbfb6beda6d6756daa335a..99e3495c2fdd258a88fd9f0d675dbf42ca590770 100644 (file)
--- a/cpu/mpc512x/speed.c
+++ b/cpu/mpc512x/speed.c
@@ -96,7 +96,7 @@ int get_clocks (void)
                ips_clk = 0;
        }
 
-       gd->ipb_clk = ips_clk;
+       gd->ips_clk = ips_clk;
        gd->csb_clk = csb_clk;
        gd->cpu_clk = core_clk;
        gd->bus_clk = csb_clk;
@@ -118,7 +118,7 @@ int do_clocks (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        printf ("Clock configuration:\n");
        printf ("  CPU:                 %4d MHz\n", gd->cpu_clk / 1000000);
        printf ("  Coherent System Bus: %4d MHz\n", gd->csb_clk / 1000000);
-       printf ("  IPS Bus:             %4d MHz\n", gd->ipb_clk / 1000000);
+       printf ("  IPS Bus:             %4d MHz\n", gd->ips_clk / 1000000);
        printf ("  DDR:                 %4d MHz\n", 2 * gd->csb_clk / 1000000);
        return 0;
 }

diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h
index c3b5e8292e5c3caacf7eb33441e1f5568a572082..aa6384c15249e93e8a534a6a1f6da24d65f4f239 100644 (file)
--- a/include/asm-ppc/global_data.h
+++ b/include/asm-ppc/global_data.h
@@ -99,7 +99,7 @@ typedef       struct  global_data {
        unsigned long   pci_clk;
 #endif
 #if defined(CONFIG_MPC512X)
-       u32 ipb_clk;
+       u32 ips_clk;
        u32 csb_clk;
 #endif /* CONFIG_MPC512X */
 #if defined(CONFIG_MPC8220)

diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index 6350918607857a3bbb69eb0d8c7661c958ede93f..7b95246e1109450449ebdef77ccf9ecbfc3f7b10 100644 (file)
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -556,7 +556,7 @@ void board_init_f (ulong bootflag)
        bd->bi_vco     = gd->vco_out;
 #endif /* CONFIG_CPM2 */
 #if defined(CONFIG_MPC512X)
-       bd->bi_ipsfreq = gd->ipb_clk;
+       bd->bi_ipsfreq = gd->ips_clk;
 #endif /* CONFIG_MPC512X */
 #if defined(CONFIG_MPC5xxx)
        bd->bi_ipbfreq = gd->ipb_clk;