diff options
Diffstat (limited to 'firmware/target/arm/as3525/system-as3525.c')
-rw-r--r-- | firmware/target/arm/as3525/system-as3525.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/firmware/target/arm/as3525/system-as3525.c b/firmware/target/arm/as3525/system-as3525.c index 24149948b8..0451cb36d2 100644 --- a/firmware/target/arm/as3525/system-as3525.c +++ b/firmware/target/arm/as3525/system-as3525.c | |||
@@ -215,15 +215,10 @@ void system_init(void) | |||
215 | "mcr p15, 0, r0, c1, c0 \n" | 215 | "mcr p15, 0, r0, c1, c0 \n" |
216 | : : : "r0" ); | 216 | : : : "r0" ); |
217 | 217 | ||
218 | CGU_PLLA = 0x4330; /* PLLA 384 MHz */ | 218 | CGU_PLLA = 0x261F; /* PLLA 248 MHz */ |
219 | while(!(CGU_INTCTRL & (1<<0))); /* wait until PLLA is locked */ | 219 | while(!(CGU_INTCTRL & (1<<0))); /* wait until PLLA is locked */ |
220 | 220 | ||
221 | CGU_PROC = (3<<2)|0x01; /* fclk = PLLA*5/8 = 240 MHz */ | 221 | CGU_PROC = 1; /* fclk = PLLA = 248 MHz */ |
222 | #ifndef BOOTLOADER | ||
223 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ | ||
224 | set_cpu_frequency(CPUFREQ_DEFAULT); | ||
225 | #endif | ||
226 | #endif | ||
227 | 222 | ||
228 | asm volatile( | 223 | asm volatile( |
229 | "mov r0, #0 \n" | 224 | "mov r0, #0 \n" |
@@ -243,16 +238,17 @@ void system_init(void) | |||
243 | VIC_INT_ENABLE = 0; /* disable all interrupt lines */ | 238 | VIC_INT_ENABLE = 0; /* disable all interrupt lines */ |
244 | CGU_PERI |= CGU_VIC_CLOCK_ENABLE; | 239 | CGU_PERI |= CGU_VIC_CLOCK_ENABLE; |
245 | VIC_INT_SELECT = 0; /* only IRQ, no FIQ */ | 240 | VIC_INT_SELECT = 0; /* only IRQ, no FIQ */ |
246 | |||
247 | enable_irq(); | ||
248 | #else | 241 | #else |
249 | /* Disable fast hardware power-off, to use power button normally | 242 | /* Disable fast hardware power-off, to use power button normally |
250 | * We don't need the power button in the bootloader. */ | 243 | * We don't need the power button in the bootloader. */ |
251 | ascodec_init(); | 244 | ascodec_init(); |
252 | ascodec_write(AS3514_CVDD_DCDC3, ascodec_read(AS3514_CVDD_DCDC3) & (1<<2)); | 245 | ascodec_write(AS3514_CVDD_DCDC3, ascodec_read(AS3514_CVDD_DCDC3) & (1<<2)); |
253 | |||
254 | #endif /* BOOTLOADER */ | 246 | #endif /* BOOTLOADER */ |
255 | 247 | ||
248 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ | ||
249 | set_cpu_frequency(CPUFREQ_DEFAULT); | ||
250 | #endif | ||
251 | |||
256 | dma_init(); | 252 | dma_init(); |
257 | } | 253 | } |
258 | 254 | ||