diff options
-rw-r--r-- | firmware/export/as3525.h | 5 | ||||
-rw-r--r-- | firmware/target/arm/as3525/system-as3525.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/firmware/export/as3525.h b/firmware/export/as3525.h index f1e51e0fb5..3c0c2a3ecf 100644 --- a/firmware/export/as3525.h +++ b/firmware/export/as3525.h | |||
@@ -219,6 +219,8 @@ CE lines | |||
219 | 219 | ||
220 | #define CGU_VIC_CLOCK_ENABLE ( 1 << 23 ) /* vic */ | 220 | #define CGU_VIC_CLOCK_ENABLE ( 1 << 23 ) /* vic */ |
221 | /* --- are disabled after reset --- */ | 221 | /* --- are disabled after reset --- */ |
222 | #define CGU_EXTMEM_CLOCK_ENABLE ( 1 << 27 ) /* external memory */ | ||
223 | #define CGU_EXTMEMIF_CLOCK_ENABLE ( 1 << 26 ) /* ext mem AHB IF */ | ||
222 | #define CGU_DMA_CLOCK_ENABLE ( 1 << 22 ) /* dma */ | 224 | #define CGU_DMA_CLOCK_ENABLE ( 1 << 22 ) /* dma */ |
223 | #define CGU_USB_CLOCK_ENABLE ( 1 << 21 ) /* usb */ | 225 | #define CGU_USB_CLOCK_ENABLE ( 1 << 21 ) /* usb */ |
224 | #define CGU_I2SOUT_APB_CLOCK_ENABLE ( 1 << 20 ) /* i2sout */ | 226 | #define CGU_I2SOUT_APB_CLOCK_ENABLE ( 1 << 20 ) /* i2sout */ |
@@ -234,8 +236,7 @@ CE lines | |||
234 | #define CGU_SSP_CLOCK_ENABLE ( 1 << 10 ) /* ssp */ | 236 | #define CGU_SSP_CLOCK_ENABLE ( 1 << 10 ) /* ssp */ |
235 | #define CGU_TIMER1_CLOCK_ENABLE ( 1 << 9 ) /* timer 1 */ | 237 | #define CGU_TIMER1_CLOCK_ENABLE ( 1 << 9 ) /* timer 1 */ |
236 | #define CGU_TIMER2_CLOCK_ENABLE ( 1 << 8 ) /* timer 2 */ | 238 | #define CGU_TIMER2_CLOCK_ENABLE ( 1 << 8 ) /* timer 2 */ |
237 | #define CGU_TIMERIF_CLOCK_ENABLE ( 1 << 7 ) /* timer | 239 | #define CGU_TIMERIF_CLOCK_ENABLE ( 1 << 7 ) /* timer interface */ |
238 | interface */ | ||
239 | 240 | ||
240 | /** ------------------------------------------------------------------ | 241 | /** ------------------------------------------------------------------ |
241 | * Number of cycles to wait before cgu is safely locked. | 242 | * Number of cycles to wait before cgu is safely locked. |
diff --git a/firmware/target/arm/as3525/system-as3525.c b/firmware/target/arm/as3525/system-as3525.c index 6c3299eea3..23c65ae041 100644 --- a/firmware/target/arm/as3525/system-as3525.c +++ b/firmware/target/arm/as3525/system-as3525.c | |||
@@ -171,7 +171,7 @@ static void sdram_delay(void) | |||
171 | /* Use the same initialization than OF */ | 171 | /* Use the same initialization than OF */ |
172 | static void sdram_init(void) | 172 | static void sdram_init(void) |
173 | { | 173 | { |
174 | CGU_PERI |= (1<<26)|(1<<27); /* extmem & extmem intf clocks */ | 174 | CGU_PERI |= (CGU_EXTMEM_CLOCK_ENABLE|CGU_EXTMEMIF_CLOCK_ENABLE); |
175 | 175 | ||
176 | MPMC_CONTROL = 0x1; /* enable MPMC */ | 176 | MPMC_CONTROL = 0x1; /* enable MPMC */ |
177 | 177 | ||
@@ -301,7 +301,7 @@ void system_init(void) | |||
301 | (AS3525_FCLK_PREDIV << 2) | | 301 | (AS3525_FCLK_PREDIV << 2) | |
302 | AS3525_FCLK_SEL); | 302 | AS3525_FCLK_SEL); |
303 | /* Set PCLK frequency */ | 303 | /* Set PCLK frequency */ |
304 | CGU_PERI = ((CGU_PERI & 0xffffff80) | /* reset divider bits 0:6 */ | 304 | CGU_PERI = ((CGU_PERI & ~0x7F) | /* reset divider bits 0:6 */ |
305 | (AS3525_PCLK_DIV0 << 2) | | 305 | (AS3525_PCLK_DIV0 << 2) | |
306 | (AS3525_PCLK_DIV1 << 6) | | 306 | (AS3525_PCLK_DIV1 << 6) | |
307 | AS3525_PCLK_SEL); | 307 | AS3525_PCLK_SEL); |