diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-08 09:14:19 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-08 09:14:19 +0200 |
| commit | 5ed28948a3ffe6c735386e59c132989869beaa3e (patch) | |
| tree | cbb940a4fa90b89abdd57d6b13d64351cfce839c /arch/arm/cpu/armv7/am33xx/clock_am43xx.c | |
| parent | e6607cffef965011ef0ddc0fbe6f4b7c0d53aeec (diff) | |
| parent | 83bad1026b9e3a4f6b7783cc1cbb434c1bbd3fa2 (diff) | |
| download | blackbird-obmc-uboot-5ed28948a3ffe6c735386e59c132989869beaa3e.tar.gz blackbird-obmc-uboot-5ed28948a3ffe6c735386e59c132989869beaa3e.zip | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/cpu/armv7/am33xx/clock_am43xx.c')
| -rw-r--r-- | arch/arm/cpu/armv7/am33xx/clock_am43xx.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/am33xx/clock_am43xx.c b/arch/arm/cpu/armv7/am33xx/clock_am43xx.c index d0bc2340c8..31188c85bc 100644 --- a/arch/arm/cpu/armv7/am33xx/clock_am43xx.c +++ b/arch/arm/cpu/armv7/am33xx/clock_am43xx.c @@ -53,6 +53,8 @@ const struct dpll_regs dpll_ddr_regs = { void setup_clocks_for_console(void) { + u32 clkctrl, idlest = MODULE_CLKCTRL_IDLEST_DISABLED; + /* Do not add any spl_debug prints in this function */ clrsetbits_le32(&cmwkup->wkclkstctrl, CD_CLKCTRL_CLKTRCTRL_MASK, CD_CLKCTRL_CLKTRCTRL_SW_WKUP << @@ -63,6 +65,13 @@ void setup_clocks_for_console(void) MODULE_CLKCTRL_MODULEMODE_MASK, MODULE_CLKCTRL_MODULEMODE_SW_EXPLICIT_EN << MODULE_CLKCTRL_MODULEMODE_SHIFT); + + while ((idlest == MODULE_CLKCTRL_IDLEST_DISABLED) || + (idlest == MODULE_CLKCTRL_IDLEST_TRANSITIONING)) { + clkctrl = readl(&cmwkup->wkup_uart0ctrl); + idlest = (clkctrl & MODULE_CLKCTRL_IDLEST_MASK) >> + MODULE_CLKCTRL_IDLEST_SHIFT; + } } void enable_basic_clocks(void) |
