len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert r28000 on the 3.7 release branch, as for as yet unknow reasons it causes playback issues on a small number of players. Thanks to Evan Carroll for testing.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_7@28366 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Alex Parker 2010-10-27 16:53:32 +00:00
parent ba55434318
commit 4c6425437f
5 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
firmware/export/config/sansaclip.h
View file

@ -154,7 +154,7 @@
/* #define HAVE_POWEROFF_WHILE_CHARGING */
/* define current usage levels (based on battery bench) */
#define CURRENT_NORMAL 37
#define CURRENT_NORMAL 42
#define CURRENT_BACKLIGHT 13
#define CURRENT_RECORD CURRENT_NORMAL

2
firmware/export/config/sansae200v2.h
View file

@ -158,7 +158,7 @@
#define CONFIG_I2C I2C_AS3525
/* define current usage levels (based on battery bench) */
#define CURRENT_NORMAL 44
#define CURRENT_NORMAL 45
#define CURRENT_BACKLIGHT 30
#define CURRENT_RECORD CURRENT_NORMAL

2
firmware/export/config/sansafuze.h
View file

@ -162,7 +162,7 @@
#define CONFIG_I2C I2C_AS3525
/* define current usage levels (based on battery bench) */
#define CURRENT_NORMAL 35
#define CURRENT_NORMAL 37
#define CURRENT_BACKLIGHT 30
#define CURRENT_RECORD CURRENT_NORMAL

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

@ -139,6 +139,7 @@
#define AS3525_FCLK_POSTDIV (CLK_DIV((AS3525_PLLA_FREQ*(8-AS3525_FCLK_PREDIV)/8), AS3525_FCLK_FREQ) - 1) /*div=1/(n+1)*/
#if CONFIG_CPU == AS3525v2
/* On as3525v2 we change fclk by writing to CGU_PROC */
#define AS3525_FCLK_POSTDIV_UNBOOSTED (CLK_DIV((AS3525_PLLA_FREQ*(8-AS3525_FCLK_PREDIV)/8), CPUFREQ_NORMAL) - 1) /*div=1/(n+1) */
/* Since pclk is based on fclk, we need to change CGU_PERI as well */
#define AS3525_PCLK_DIV0_UNBOOSTED (CLK_DIV(CPUFREQ_NORMAL, AS3525_DRAM_FREQ) - 1) /*div=1/(n+1)*/
@ -163,18 +164,21 @@
/* PCLK */
#if CONFIG_CPU == AS3525
/* Figure out if we need to use asynchronous bus */
#if ((CONFIG_CPU == AS3525) && (AS3525_FCLK_FREQ % AS3525_PCLK_FREQ))
#define ASYNCHRONOUS_BUS /* Boosted mode asynchronous */
#endif
#ifdef ASYNCHRONOUS_BUS
#define AS3525_PCLK_SEL AS3525_CLK_PLLA /* PLLA input for asynchronous */
#define AS3525_PCLK_DIV0 (CLK_DIV(AS3525_PLLA_FREQ, AS3525_DRAM_FREQ) - 1) /*div=1/(n+1)*/
#else /* ASYNCHRONOUS_BUS */
#define AS3525_PCLK_SEL AS3525_CLK_FCLK /* Fclk input for synchronous */
#define AS3525_PCLK_DIV0 (CLK_DIV(AS3525_FCLK_FREQ, AS3525_DRAM_FREQ) - 1) /*div=1/(n+1)*/
#endif /* ASYNCHRONOUS_BUS */
#define AS3525_PCLK_SEL AS3525_CLK_PLLA
/*unable to use AS3525_PCLK_DIV1 != 0 successfuly so far*/
#define AS3525_PCLK_DIV1 (CLK_DIV(AS3525_DRAM_FREQ, AS3525_PCLK_FREQ) - 1)/* div = 1/(n+1)*/
#define AS3525_PCLK_DIV0 (CLK_DIV(AS3525_PLLA_FREQ, AS3525_DRAM_FREQ) - 1) /*div=1/(n+1)*/
#else
#define AS3525_PCLK_SEL AS3525_CLK_FCLK
#define AS3525_PCLK_DIV0 (CLK_DIV(AS3525_FCLK_FREQ, AS3525_DRAM_FREQ) - 1) /*div=1/(n+1)*/
#endif /* CONFIG_CPU */
/* PCLK as Source */
#define AS3525_DBOP_DIV (CLK_DIV(AS3525_PCLK_FREQ, AS3525_DBOP_FREQ) - 1) /*div=1/(n+1)*/

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

@ -262,7 +262,11 @@ void system_init(void)
#endif
AS3525_PCLK_SEL);
set_cpu_frequency(CPUFREQ_DEFAULT);
#if CONFIG_CPU == AS3525
cpu_frequency = CPUFREQ_DEFAULT; /* fastbus */
#else
cpu_frequency = CPUFREQ_MAX;
#endif
#if 0 /* the GPIO clock is already enabled by the dualboot function */
CGU_PERI |= CGU_GPIO_CLOCK_ENABLE;
@ -363,14 +367,15 @@ void set_cpu_frequency(long frequency)
while(adc_read(ADC_CVDD) < 470); /* 470 * .0025 = 1.175V */
#endif /* HAVE_ADJUSTABLE_CPU_VOLTAGE */
CGU_PROC = ((AS3525_FCLK_POSTDIV << 4) |
(AS3525_FCLK_PREDIV << 2) |
AS3525_FCLK_SEL);
asm volatile(
"mrc p15, 0, r0, c1, c0 \n"
#ifdef ASYNCHRONOUS_BUS
"orr r0, r0, #3<<30 \n" /* asynchronous bus clocking */
#else
"bic r0, r0, #3<<30 \n" /* clear bus bits */
"orr r0, r0, #1<<30 \n" /* synchronous bus clocking */
#endif
"mcr p15, 0, r0, c1, c0 \n"
: : : "r0" );
@ -384,8 +389,6 @@ void set_cpu_frequency(long frequency)
"mcr p15, 0, r0, c1, c0 \n"
: : : "r0" );
/* FCLK is unused so put it to the lowest freq we can */
CGU_PROC = ((0xf << 4) | (0x3 << 2) | AS3525_CLK_MAIN);
#ifdef HAVE_ADJUSTABLE_CPU_VOLTAGE
/* Decreasing frequency so reduce voltage after change */