iPod G3: Clock setup register display and CPU clock estimation in debug menu. * Fix clock being set to only half of what it should be (introduced with clock setup changes for PP502x).

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13844 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 11 insertions, 2 deletions

diff --git a/firmware/export/pp5002.h b/firmware/export/pp5002.h
index 9636313390..0610da8bf1 100644
--- a/firmware/export/pp5002.h
+++ b/firmware/export/pp5002.h
@@ -116,6 +116,15 @@
 #define SER1_MASK    (1 << SER1_IRQ)
 #define DMA_OUT_MASK (1 << DMA_OUT_IRQ)
 
+#define TIMING1_CTL         (*(volatile unsigned long*)(0xcf004000))
+#define TIMING2_CTL         (*(volatile unsigned long*)(0xcf004008))
+
+#define CLOCK_ENABLE        (*(volatile unsigned long*)(0xcf005008))
+#define CLOCK_SOURCE        (*(volatile unsigned long*)(0xcf00500c))
+#define CLOCK_DIV           (*(volatile unsigned long*)(0xcf005010))
+#define PLL_DIV             (*(volatile unsigned long*)(0xcf005018))
+#define PLL_MULT            (*(volatile unsigned long*)(0xcf00501c))
+
 #define MMAP0_LOGICAL       (*(volatile unsigned long*)(0xf000f000))
 #define MMAP0_PHYSICAL      (*(volatile unsigned long*)(0xf000f004))
 #define MMAP1_LOGICAL       (*(volatile unsigned long*)(0xf000f008))
diff --git a/firmware/target/arm/system-pp5002.c b/firmware/target/arm/system-pp5002.c
index 20f68cc119..e8410df619 100644
--- a/firmware/target/arm/system-pp5002.c
+++ b/firmware/target/arm/system-pp5002.c
@@ -100,8 +100,8 @@ void set_cpu_frequency(long frequency)
         outl(0x55, 0xcf00500c);
         outl(0x6000, 0xcf005010);
 
-        /* Clock frequency = (24/8)*postmult */
-        outl(8, 0xcf005018);
+        /* Clock frequency = (24/4)*postmult */
+        outl(4, 0xcf005018);
         outl(postmult, 0xcf00501c);
 
         outl(0xe000, 0xcf005010);