rendered paste bodyIndex: apps/debug_menu.c
===================================================================
--- apps/debug_menu.c (revision 14099)
+++ apps/debug_menu.c (working copy)
@@ -636,7 +636,29 @@
lcd_clear_display();
lcd_puts(0, line++, "[Hardware info]");
-
+ lcd_puts(0, line++, "test1");
+ lcd_update();
+
+ set_cpu_frequency(CPUFREQ_SLEEP);
+
+ asm (
+ "mrs r2, CPSR \n"
+ "orr r0, r2, #0xc0 \n" /* disable IRQ and FIQ */
+ "msr CPSR_c, r0 \n"
+ "mov r0, #0x0 \n"
+ "mov r1, #0x4000 \n"
+ "1: \n"
+ "add r0, r0, #0x1 \n"
+ "cmp r0, r1 \n"
+ "bcc 1b \n"
+ "msr CPSR_c, r2 \n" /* reset IRQ and FIQ state */
+ );
+
+ set_cpu_frequency(CPUFREQ_NORMAL);
+
+ lcd_puts(0, line++, "test2");
+ lcd_update();
+
#ifdef IPOD_ARCH
snprintf(buf, sizeof(buf), "HW rev: 0x%08lx", IPOD_HW_REVISION);
lcd_puts(0, line++, buf);
Index: firmware/target/arm/system-target.h
===================================================================
--- firmware/target/arm/system-target.h (revision 14099)
+++ firmware/target/arm/system-target.h (working copy)
@@ -32,6 +32,7 @@
#define CPUFREQ_MAX 80000000
#else /* PP5022, PP5024 */
+#define CPUFREQ_SLEEP 32768
#define CPUFREQ_DEFAULT 24000000
#define CPUFREQ_NORMAL 30000000
#define CPUFREQ_MAX 80000000
Index: firmware/target/arm/system-pp502x.c
===================================================================
--- firmware/target/arm/system-pp502x.c (revision 14099)
+++ firmware/target/arm/system-pp502x.c (working copy)
@@ -107,7 +107,6 @@
#endif
{
unsigned long clcd_clock_src;
- bool use_pll = true;
#if defined(HAVE_ADJUSTABLE_CPU_FREQ) && (NUM_CORES > 1)
/* Using mutex or spinlock isn't safe here. */
@@ -121,31 +120,39 @@
cpu_frequency = frequency;
clcd_clock_src = CLCD_CLOCK_SRC; /* save selected color LCD clock source */
- CLOCK_SOURCE = (CLOCK_SOURCE & ~0xf000000f) | 0x10000002;
- /* set clock source 1 to 24MHz and select it */
- CLCD_CLOCK_SRC &= ~0xc0000000; /* select 24MHz as color LCD clock source */
-
switch (frequency)
{
#if CONFIG_CPU == PP5020
case CPUFREQ_MAX:
- DEV_TIMING1 = 0x00000808;
- PLL_CONTROL = 0x8a020a03; /* 10/3 * 24MHz */
- PLL_STATUS = 0xd19b; /* unlock frequencies > 66MHz */
- PLL_CONTROL = 0x8a020a03; /* repeat setup */
- udelay(500); /* wait for relock */
+ CLOCK_SOURCE = 0x10007772; /* source #1: 24MHz, #2, #3, #4: PLL */
+ CLCD_CLOCK_SRC &= ~0xc0000000; /* select 24MHz as color LCD clock source */
+ DEV_TIMING1 = 0x00000808;
+ PLL_CONTROL = 0x8a020a03; /* 10/3 * 24MHz */
+ PLL_STATUS = 0xd19b; /* unlock frequencies > 66MHz */
+ PLL_CONTROL = 0x8a020a03; /* repeat setup */
+ udelay(500); /* wait for relock */
break;
case CPUFREQ_NORMAL:
- DEV_TIMING1 = 0x00000303;
- PLL_CONTROL = 0x8a020504; /* 5/4 * 24MHz */
- udelay(500); /* wait for relock */
+ CLOCK_SOURCE = 0x10007772; /* source #1: 24MHz, #2, #3, #4: PLL */
+ CLCD_CLOCK_SRC &= ~0xc0000000; /* select 24MHz as color LCD clock source */
+ DEV_TIMING1 = 0x00000303;
+ PLL_CONTROL = 0x8a020504; /* 5/4 * 24MHz */
+ udelay(500); /* wait for relock */
break;
+ case CPUFREQ_SLEEP:
+ CLOCK_SOURCE = 0x10002202; /* source #2: 32kHz, #1, #3, #4: 24MHz */
+ CLCD_CLOCK_SRC &= ~0xc0000000; /* select 24MHz as color LCD clock source */
+ PLL_CONTROL &= ~0x80000000; /* disable PLL */
+ udelay(10000); /* let 32kHz source stabilize? */
+ break;
+
default:
- DEV_TIMING1 = 0x00000303;
+ CLOCK_SOURCE = 0x10002222; /* source #1, #2, #3, #4: 24MHz */
+ CLCD_CLOCK_SRC &= ~0xc0000000; /* select 24MHz as color LCD clock source */
+ DEV_TIMING1 = 0x00000303;
PLL_CONTROL &= ~0x80000000; /* disable PLL */
- use_pll = false;
cpu_frequency = CPUFREQ_DEFAULT;
break;
@@ -155,29 +162,40 @@
* PP5026 is similar to PP5022 except it doesn't
* have this limitation (and the post divider?) */
case CPUFREQ_MAX:
- DEV_TIMING1 = 0x00000808;
- PLL_CONTROL = 0x8a121403; /* (20/3 * 24MHz) / 2 */
+ CLOCK_SOURCE = 0x10007772; /* source #1: 24MHz, #2, #3, #4: PLL */
+ CLCD_CLOCK_SRC &= ~0xc0000000; /* select 24MHz as color LCD clock source */
+ DEV_TIMING1 = 0x00000808;
+ PLL_CONTROL = 0x8a121403; /* (20/3 * 24MHz) / 2 */
udelay(250);
while (!(PLL_STATUS & 0x80000000)); /* wait for relock */
break;
case CPUFREQ_NORMAL:
- DEV_TIMING1 = 0x00000303;
- PLL_CONTROL = 0x8a220501; /* (5/1 * 24MHz) / 4 */
+ CLOCK_SOURCE = 0x10007772; /* source #1: 24MHz, #2, #3, #4: PLL */
+ CLCD_CLOCK_SRC &= ~0xc0000000; /* select 24MHz as color LCD clock source */
+ DEV_TIMING1 = 0x00000303;
+ PLL_CONTROL = 0x8a220501; /* (5/1 * 24MHz) / 4 */
udelay(250);
while (!(PLL_STATUS & 0x80000000)); /* wait for relock */
break;
+ case CPUFREQ_SLEEP:
+ CLOCK_SOURCE = 0x10002202; /* source #2: 32kHz, #1, #3, #4: 24MHz */
+ CLCD_CLOCK_SRC &= ~0xc0000000; /* select 24MHz as color LCD clock source */
+ PLL_CONTROL &= ~0x80000000; /* disable PLL */
+ udelay(10000); /* let 32kHz source stabilize? */
+ break;
+
default:
- DEV_TIMING1 = 0x00000303;
+ CLOCK_SOURCE = 0x10002222; /* source #1, #2, #3, #4: 24MHz */
+ CLCD_CLOCK_SRC &= ~0xc0000000; /* select 24MHz as color LCD clock source */
+ DEV_TIMING1 = 0x00000303;
PLL_CONTROL &= ~0x80000000; /* disable PLL */
- use_pll = false;
cpu_frequency = CPUFREQ_DEFAULT;
break;
#endif
}
- if (use_pll) /* set clock source 2 to PLL and select it */
- CLOCK_SOURCE = (CLOCK_SOURCE & ~0xf00000f0) | 0x20000070;
+ CLOCK_SOURCE = (CLOCK_SOURCE&~0xf000000)|0x20000000; /* select source #2 */
CLCD_CLOCK_SRC; /* dummy read (to sync the write pipeline??) */
CLCD_CLOCK_SRC = clcd_clock_src; /* restore saved value */