Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-09-23 08:01:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

ARM: OMAP4/5: Centralize early clock initialization

Browse source 
Early clock initialization is currently done in two stages for OMAP4/5
SoCs. The first stage is the initialization of console clocks and
then we initialize basic clocks for functionality necessary for SoC
initialization and basic board functionality.

By splitting up prcm_init and centralizing this clock initialization,
we setup the code for follow on patches that can do board specific
initialization such as board detection which will depend on these
basic clocks.

As part of this change, since the early clock initialization
is centralized, we no longer need to expose the console clock
initialization.

NOTE: we change the sequence slightly by initializing console clocks
timer after the io settings are complete, but this is not expected
to have any functioanlity impact since we setup the basic IO drive
strength initialization as part of do_io_settings.

Signed-off-by: Steve Kipisz <s-kipisz2@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Kipisz, Steven 2016-02-24 12:30:52 -06:00 committed by Tom Rini
parent 96debd1f0b
commit 93e6253d11
4 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
arch/arm/cpu/armv7/omap-common/clocks-common.c
View file

@ -769,7 +769,7 @@ void lock_dpll(u32 const base)
wait_for_lock(base);
}
void setup_clocks_for_console(void)
static void setup_clocks_for_console(void)
{
/* Do not add any spl_debug prints in this function */
clrsetbits_le32((*prcm)->cm_l4per_clkstctrl, CD_CLKCTRL_CLKTRCTRL_MASK,
@ -853,14 +853,31 @@ void do_disable_clocks(u32 const *clk_domains,
disable_clock_domain(clk_domains[i]);
}
/**
* setup_early_clocks() - Setup early clocks needed for SoC
*
* Setup clocks for console, SPL basic initialization clocks and initialize
* the timer. This is invoked prior prcm_init.
*/
void setup_early_clocks(void)
{
switch (omap_hw_init_context()) {
case OMAP_INIT_CONTEXT_SPL:
case OMAP_INIT_CONTEXT_UBOOT_FROM_NOR:
case OMAP_INIT_CONTEXT_UBOOT_AFTER_CH:
setup_clocks_for_console();
enable_basic_clocks();
timer_init();
/* Fall through */
}
}
void prcm_init(void)
{
switch (omap_hw_init_context()) {
case OMAP_INIT_CONTEXT_SPL:
case OMAP_INIT_CONTEXT_UBOOT_FROM_NOR:
case OMAP_INIT_CONTEXT_UBOOT_AFTER_CH:
enable_basic_clocks();
timer_init();
scale_vcores(*omap_vcores);
setup_dplls();
setup_warmreset_time();

3
arch/arm/cpu/armv7/omap-common/hwinit-common.c
View file

@ -125,10 +125,9 @@ void s_init(void)
set_mux_conf_regs();
#ifdef CONFIG_SPL_BUILD
srcomp_enable();
setup_clocks_for_console();
do_io_settings();
#endif
setup_early_clocks();
prcm_init();
}

2
arch/arm/include/asm/arch-omap4/sys_proto.h
View file

@ -37,7 +37,7 @@ void do_set_mux(u32 base, struct pad_conf_entry const *array, int size);
void set_muxconf_regs_essential(void);
u32 wait_on_value(u32, u32, void *, u32);
void sdelay(unsigned long);
void setup_clocks_for_console(void);
void setup_early_clocks(void);
void prcm_init(void);
void bypass_dpll(u32 const base);
void freq_update_core(void);

2
arch/arm/include/asm/arch-omap5/sys_proto.h
View file

@ -48,7 +48,7 @@ void do_set_mux32(u32 base, struct pad_conf_entry const *array, int size);
void set_muxconf_regs_essential(void);
u32 wait_on_value(u32, u32, void *, u32);
void sdelay(unsigned long);
void setup_clocks_for_console(void);
void setup_early_clocks(void);
void prcm_init(void);
void bypass_dpll(u32 const base);
void freq_update_core(void);