board_f: powerpc: Rename get_clocks_866() to get_clocks()

We really don't need to have a name like this in the generic init
sequence. Use the generic get_clocks() name so that we can merge these
two at some point.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: York Sun <york.sun@nxp.com>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/arch/powerpc/cpu/mpc8xx/speed.c b/arch/powerpc/cpu/mpc8xx/speed.c
index 42442b8c986eb147bf5cf5a08e87ffb2ccfe4134..613209cc6dd0058bf9f27e90f36bdbeed1bf7b2f 100644 (file)
--- a/arch/powerpc/cpu/mpc8xx/speed.c
+++ b/arch/powerpc/cpu/mpc8xx/speed.c
@@ -243,7 +243,7 @@ static long init_pll_866 (long clk);
  * contains invalid value).
  * This functions requires an MPC866 or newer series CPU.
  */
-int get_clocks_866 (void)
+int get_clocks(void)
 {
        volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
        char              tmp[64];

diff --git a/common/board_f.c b/common/board_f.c
index 326faef105aec6d89334bf88dd93d843476e1e2c..84ffc90d5a6d25c5cfb9e775f6c2e67fca4f5f79 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -831,7 +831,7 @@ static const init_fnc_t init_sequence_f[] = {
        /* TODO: can any of this go into arch_cpu_init()? */
 #if defined(CONFIG_8xx_CPUCLK_DEFAULT)
        /* get CPU and bus clocks according to the environment variable */
-       get_clocks_866,
+       get_clocks,
        /* adjust sdram refresh rate according to the new clock */
        sdram_adjust_866,
        init_timebase,

diff --git a/include/common.h b/include/common.h
index 5f5c0f46e04de594fa4ae0acf1570e21b747237f..ad8c18cd6afb2de920845aa27e89f8394513a931 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -637,7 +637,6 @@ int serial_stub_tstc(struct stdio_dev *sdev);
 
 /* $(CPU)/speed.c */
 int    get_clocks (void);
-int    get_clocks_866 (void);
 int    sdram_adjust_866 (void);
 int    adjust_sdram_tbs_8xx (void);
 #if defined(CONFIG_MPC8260)