dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-29 22:41:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

board_f: Remove sdram_adjust_866() from the init sequence

Browse Source 
We can just call this from the only function that needs it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Simon Glass
2017-03-28 10:27:21 -06:00
committed by Tom Rini
parent d593c61672
commit 26345552d6
3 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
arch/powerpc/cpu/mpc8xx/speed.c
View File

@@ -237,6 +237,21 @@ int get_clocks (void)
static long init_pll_866 (long clk); static long init_pll_866 (long clk);
/* Adjust sdram refresh rate to actual CPU clock.
*/
static int sdram_adjust_866(void)
{
volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
long mamr;
mamr = immr->im_memctl.memc_mamr;
mamr &= ~MAMR_PTA_MSK;
mamr |= ((gd->cpu_clk / CONFIG_SYS_PTA_PER_CLK) << MAMR_PTA_SHIFT);
immr->im_memctl.memc_mamr = mamr;
return 0;
}
/* This function sets up PLL (init_pll_866() is called) and /* This function sets up PLL (init_pll_866() is called) and
* fills gd->cpu_clk and gd->bus_clk according to the environment * fills gd->cpu_clk and gd->bus_clk according to the environment
* variable 'cpuclk' or to CONFIG_8xx_CPUCLK_DEFAULT (if 'cpuclk' * variable 'cpuclk' or to CONFIG_8xx_CPUCLK_DEFAULT (if 'cpuclk'
@@ -278,22 +293,7 @@ int get_clocks(void)
} }
immr->im_clkrst.car_sccr = sccr_reg; immr->im_clkrst.car_sccr = sccr_reg;
return (0); return sdram_adjust_866();
}
/* Adjust sdram refresh rate to actual CPU clock.
*/
int sdram_adjust_866 (void)
{
volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
long mamr;
mamr = immr->im_memctl.memc_mamr;
mamr &= ~MAMR_PTA_MSK;
mamr |= ((gd->cpu_clk / CONFIG_SYS_PTA_PER_CLK) << MAMR_PTA_SHIFT);
immr->im_memctl.memc_mamr = mamr;
return (0);
} }
/* Configure PLL for MPC866/859/885 CPU series /* Configure PLL for MPC866/859/885 CPU series

2
common/board_f.c
View File

@@ -832,8 +832,6 @@ static const init_fnc_t init_sequence_f[] = {
#if defined(CONFIG_8xx_CPUCLK_DEFAULT) #if defined(CONFIG_8xx_CPUCLK_DEFAULT)
/* get CPU and bus clocks according to the environment variable */ /* get CPU and bus clocks according to the environment variable */
get_clocks, get_clocks,
/* adjust sdram refresh rate according to the new clock */
sdram_adjust_866,
init_timebase, init_timebase,
#elif defined(CONFIG_PPC) #elif defined(CONFIG_PPC)
get_clocks, /* get CPU and bus clocks (etc.) */ get_clocks, /* get CPU and bus clocks (etc.) */

1
include/common.h
View File

@@ -637,7 +637,6 @@ int serial_stub_tstc(struct stdio_dev *sdev);
/* $(CPU)/speed.c */ /* $(CPU)/speed.c */
int get_clocks (void); int get_clocks (void);
int sdram_adjust_866 (void);
int adjust_sdram_tbs_8xx (void); int adjust_sdram_tbs_8xx (void);
#if defined(CONFIG_MPC8260) #if defined(CONFIG_MPC8260)
int prt_8260_clks (void); int prt_8260_clks (void);