Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

as3525v2: adjustable CPU freq : CGU_PROC is identical to as3525 after all

Browse source 
Instead of modifying CGU_PROC to get 24MHz pclk, just switch to fastbus else Clip+ wouldn't boot
Tested on fuzev1/Clip+

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25413 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2010-04-01 02:39:25 +00:00
parent 8cccb6e099
commit 39e78993f3
5 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
firmware/export/config/sansaclipplus.h
View file

@ -161,7 +161,7 @@
#define ROM_START 0x00000000 #define ROM_START 0x00000000
/* Define this to the CPU frequency */ /* Define this to the CPU frequency */
#define CPU_FREQ 250000000 #define CPU_FREQ 240000000
/* Type of LCD */ /* Type of LCD */
#define CONFIG_LCD LCD_SSD1303 #define CONFIG_LCD LCD_SSD1303
@ -188,7 +188,7 @@
#define CONFIG_LED LED_VIRTUAL #define CONFIG_LED LED_VIRTUAL
/* Define this if you have adjustable CPU frequency */ /* Define this if you have adjustable CPU frequency */
//#define HAVE_ADJUSTABLE_CPU_FREQ #define HAVE_ADJUSTABLE_CPU_FREQ
#define BOOTFILE_EXT "sansa" #define BOOTFILE_EXT "sansa"
#define BOOTFILE "rockbox." BOOTFILE_EXT #define BOOTFILE "rockbox." BOOTFILE_EXT

4
firmware/export/config/sansaclipv2.h
View file

@ -157,7 +157,7 @@
#define ROM_START 0x00000000 #define ROM_START 0x00000000
/* Define this to the CPU frequency */ /* Define this to the CPU frequency */
#define CPU_FREQ 250000000 #define CPU_FREQ 240000000
/* Type of LCD */ /* Type of LCD */
#define CONFIG_LCD LCD_SSD1303 #define CONFIG_LCD LCD_SSD1303
@ -184,7 +184,7 @@
#define CONFIG_LED LED_VIRTUAL #define CONFIG_LED LED_VIRTUAL
/* Define this if you have adjustable CPU frequency */ /* Define this if you have adjustable CPU frequency */
//#define HAVE_ADJUSTABLE_CPU_FREQ #define HAVE_ADJUSTABLE_CPU_FREQ
#define BOOTFILE_EXT "sansa" #define BOOTFILE_EXT "sansa"
#define BOOTFILE "rockbox." BOOTFILE_EXT #define BOOTFILE "rockbox." BOOTFILE_EXT

4
firmware/export/config/sansafuzev2.h
View file

@ -165,7 +165,7 @@
#define CURRENT_RECORD CURRENT_NORMAL #define CURRENT_RECORD CURRENT_NORMAL
/* Define this to the CPU frequency */ /* Define this to the CPU frequency */
#define CPU_FREQ 250000000 #define CPU_FREQ 240000000
/* Type of LCD */ /* Type of LCD */
#define CONFIG_LCD LCD_FUZE #define CONFIG_LCD LCD_FUZE
@ -196,7 +196,7 @@
#endif /* !BOOTLOADER */ #endif /* !BOOTLOADER */
/* Define this if you have adjustable CPU frequency */ /* Define this if you have adjustable CPU frequency */
//#define HAVE_ADJUSTABLE_CPU_FREQ #define HAVE_ADJUSTABLE_CPU_FREQ
#define BOOTFILE_EXT "sansa" #define BOOTFILE_EXT "sansa"
#define BOOTFILE "rockbox." BOOTFILE_EXT #define BOOTFILE "rockbox." BOOTFILE_EXT

1
firmware/target/arm/as3525/clock-target.h
View file

@ -66,7 +66,6 @@
#define AS3525_PLLA_FREQ 240000000 #define AS3525_PLLA_FREQ 240000000
#define AS3525_PLLA_SETTING 0x113B #define AS3525_PLLA_SETTING 0x113B
/* XXX: CGU_PROC seems to be different as well */
#define AS3525_FCLK_PREDIV 0 #define AS3525_FCLK_PREDIV 0
#define AS3525_FCLK_FREQ AS3525_PLLA_FREQ #define AS3525_FCLK_FREQ AS3525_PLLA_FREQ

17
firmware/target/arm/as3525/system-as3525.c
View file

@ -254,11 +254,14 @@ void system_init(void)
CCU_SCON = 1; /* AHB master's priority configuration : CCU_SCON = 1; /* AHB master's priority configuration :
TIC (Test Interface Controller) > DMA > USB > IDE > ARM */ TIC (Test Interface Controller) > DMA > USB > IDE > ARM */
#if CONFIG_CPU == AS3525
CGU_PROC = 0; /* fclk 24 MHz */
#endif
CGU_PERI &= ~0x7f; /* pclk 24 MHz */ CGU_PERI &= ~0x7f; /* pclk 24 MHz */
asm volatile(
"mrc p15, 0, r0, c1, c0 \n" /* control register */
"bic r0, r0, #3<<30 \n" /* clears bus bits : sets fastbus */
"mcr p15, 0, r0, c1, c0 \n"
: : : "r0" );
CGU_PLLASUP = 0; /* enable PLLA */ CGU_PLLASUP = 0; /* enable PLLA */
CGU_PLLA = AS3525_PLLA_SETTING; CGU_PLLA = AS3525_PLLA_SETTING;
while(!(CGU_INTCTRL & (1<<0))); /* wait until PLLA is locked */ while(!(CGU_INTCTRL & (1<<0))); /* wait until PLLA is locked */
@ -269,12 +272,10 @@ void system_init(void)
while(!(CGU_INTCTRL & (1<<1))); /* wait until PLLB is locked */ while(!(CGU_INTCTRL & (1<<1))); /* wait until PLLB is locked */
#endif #endif
#if CONFIG_CPU == AS3525
/* Set FCLK frequency */ /* Set FCLK frequency */
CGU_PROC = ((AS3525_FCLK_POSTDIV << 4) | CGU_PROC = ((AS3525_FCLK_POSTDIV << 4) |
(AS3525_FCLK_PREDIV << 2) | (AS3525_FCLK_PREDIV << 2) |
AS3525_FCLK_SEL); AS3525_FCLK_SEL);
#endif
/* Set PCLK frequency */ /* Set PCLK frequency */
CGU_PERI = ((CGU_PERI & ~0x7F) | /* reset divider & clksel bits */ CGU_PERI = ((CGU_PERI & ~0x7F) | /* reset divider & clksel bits */
@ -282,12 +283,6 @@ void system_init(void)
(AS3525_PCLK_DIV1 << 6) | (AS3525_PCLK_DIV1 << 6) |
AS3525_PCLK_SEL); AS3525_PCLK_SEL);
asm volatile(
"mrc p15, 0, r0, c1, c0 \n" /* control register */
"bic r0, r0, #3<<30 \n" /* clears bus bits : sets fastbus */
"mcr p15, 0, r0, c1, c0 \n"
: : : "r0" );
#ifdef BOOTLOADER #ifdef BOOTLOADER
sdram_init(); sdram_init();
#endif /* BOOTLOADER */ #endif /* BOOTLOADER */