LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am33xx: Move the call to ddr_pll_config, make it take the frequency 

Depending on if we have DDR2 or DDR3 on the board we will need to call
ddr_pll_config with a different value.  This call can be delayed
slightly to the point where we know which type of memory we have.

Signed-off-by: Tom Rini <trini@ti.com>
This commit is contained in:
Tom Rini 2012-07-03 09:20:06 -07:00 committed by Albert ARIBAUD
parent fda35eb982
commit b971dfad6a
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/cpu/armv7/am33xx/clock.c
View File

@ -246,7 +246,7 @@ static void per_pll_config(void)
; ;
} }
static void ddr_pll_config(void) void ddr_pll_config(unsigned int ddrpll_m)
{ {
u32 clkmode, clksel, div_m2; u32 clkmode, clksel, div_m2;
@ -264,7 +264,7 @@ static void ddr_pll_config(void)
; ;
clksel = clksel & (~CLK_SEL_MASK); clksel = clksel & (~CLK_SEL_MASK);
clksel = clksel | ((DDRPLL_M << CLK_SEL_SHIFT) | DDRPLL_N); clksel = clksel | ((ddrpll_m << CLK_SEL_SHIFT) | DDRPLL_N);
writel(clksel, &cmwkup->clkseldpllddr); writel(clksel, &cmwkup->clkseldpllddr);
div_m2 = div_m2 & CLK_DIV_SEL; div_m2 = div_m2 & CLK_DIV_SEL;
@ -298,7 +298,6 @@ void pll_init()
mpu_pll_config(); mpu_pll_config();
core_pll_config(); core_pll_config();
per_pll_config(); per_pll_config();
ddr_pll_config();
/* Enable the required interconnect clocks */ /* Enable the required interconnect clocks */
enable_interface_clocks(); enable_interface_clocks();

2
arch/arm/cpu/armv7/am33xx/emif4.c
View File

@ -21,6 +21,7 @@
#include <asm/arch/ddr_defs.h> #include <asm/arch/ddr_defs.h>
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#include <asm/arch/sys_proto.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/emif.h> #include <asm/emif.h>
@ -150,6 +151,7 @@ void config_ddr(short ddr_type)
enable_emif_clocks(); enable_emif_clocks();
if (ddr_type == EMIF_REG_SDRAM_TYPE_DDR2) { if (ddr_type == EMIF_REG_SDRAM_TYPE_DDR2) {
ddr_pll_config(266);
config_vtp(); config_vtp();
config_cmd_ctrl(&ddr2_cmd_ctrl_data); config_cmd_ctrl(&ddr2_cmd_ctrl_data);

1
arch/arm/include/asm/arch-am33xx/sys_proto.h
View File

@ -30,4 +30,5 @@ int print_cpuinfo(void);
u32 get_device_type(void); u32 get_device_type(void);
void setup_clocks_for_console(void); void setup_clocks_for_console(void);
void ddr_pll_config(unsigned int ddrpll_M);
#endif #endif