aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass2017-03-28 10:27:20 -0600
committerTom Rini2017-04-05 13:52:50 -0400
commitd593c61672eb0fe21380750b3b1a816cea9f86bd (patch)
tree7fa27eff4766f35eab3491f719f6a1c7ad46da4b
parentc252c06857b8ed73284ea526f5b1260f32ea166a (diff)
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>
-rw-r--r--arch/powerpc/cpu/mpc8xx/speed.c2
-rw-r--r--common/board_f.c2
-rw-r--r--include/common.h1
3 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/cpu/mpc8xx/speed.c b/arch/powerpc/cpu/mpc8xx/speed.c
index 42442b8c986..613209cc6dd 100644
--- 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 326faef105a..84ffc90d5a6 100644
--- 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 5f5c0f46e04..ad8c18cd6af 100644
--- 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)