AMS: make sure ROM clock is always on

Change-Id: Ib73b21b944cb609cc26f7f6955d2c894628f65ad
This commit is contained in:
Rafaël Carré 2012-11-12 21:52:55 +01:00
parent 1272e85299
commit 5ce81fde37

View file

@ -272,10 +272,6 @@ void system_init(void)
CGU_PERI &= ~0x7f; /* pclk 24 MHz */
#endif
/*this saves a tiny bit of power but seems to leave the processor in
a bad state if it manages to reboot without the clock reenabled*/
/*CGU_PERI &= ~CGU_ROM_ENABLE;*/ /*disable built in boot rom clock*/
/* bits 31:30 should be set to 0 in arm926-ejs */
asm volatile(
"mrc p15, 0, r0, c1, c0 \n" /* control register */
@ -308,6 +304,8 @@ void system_init(void)
#endif
AS3525_PCLK_SEL);
CGU_PERI |= CGU_ROM_ENABLE; /* needed for rebooting */
set_cpu_frequency(CPUFREQ_DEFAULT);
#if 0 /* the GPIO clock is already enabled by the dualboot function */
@ -366,9 +364,6 @@ void system_reboot(void)
disable_irq();
/* re-enable internal ROM so that we don't hard lock on power up*/
CGU_PERI |= CGU_ROM_ENABLE; /*should always be on, but to be safe...*/
/* use watchdog to reset */
CGU_PERI |= (CGU_WDOCNT_CLOCK_ENABLE | CGU_WDOIF_CLOCK_ENABLE);
WDT_LOAD = 1; /* set counter to 1 */