Sansa AMS: Use a valid PLL setting (248MHz aka maximum fclk)

Fix lcd drivers which stopped working after changing the PLL.
Move set_cpu_frequency() to a place where it is actually used.
Remove enable_irq() call already done by the bootloader

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

4 files changed, 11 insertions, 16 deletions

diff --git a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c
index f26381859f..6bdee395c0 100644
--- a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c
+++ b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c
@@ -94,7 +94,7 @@ static void lcd_delay(int x)
 /* DBOP initialisation, do what OF does */
 static void ams3525_dbop_init(void)
 {
-    CGU_DBOP = (1<<3) | (4-1);
+    CGU_DBOP = (1<<3) | (3-1);
 
     DBOP_TIMPOL_01 = 0xe167e167;
     DBOP_TIMPOL_23 = 0xe167006e;
diff --git a/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c b/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c
index af57041140..cc61a82c6f 100644
--- a/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c
+++ b/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c
@@ -49,8 +49,7 @@ static void lcd_delay(int x)
 
 static void as3525_dbop_init(void)
 {
-    CGU_DBOP = (1<<3) | (4-1);
-
+    CGU_DBOP = (1<<3);
     DBOP_TIMPOL_01 = 0xe167e167;
     DBOP_TIMPOL_23 = 0xe167006e;
     DBOP_CTRL = 0x41008;
diff --git a/firmware/target/arm/as3525/system-as3525.c b/firmware/target/arm/as3525/system-as3525.c
index 24149948b8..0451cb36d2 100644
--- a/firmware/target/arm/as3525/system-as3525.c
+++ b/firmware/target/arm/as3525/system-as3525.c
@@ -215,15 +215,10 @@ void system_init(void)
         "mcr p15, 0, r0, c1, c0  \n"
         : : : "r0" );
 
-    CGU_PLLA = 0x4330;      /* PLLA 384 MHz */
+    CGU_PLLA = 0x261F;  /* PLLA 248 MHz */
     while(!(CGU_INTCTRL & (1<<0))); /* wait until PLLA is locked */
 
-    CGU_PROC = (3<<2)|0x01; /* fclk = PLLA*5/8 = 240 MHz */
-#ifndef BOOTLOADER
-#ifdef HAVE_ADJUSTABLE_CPU_FREQ
-    set_cpu_frequency(CPUFREQ_DEFAULT);
-#endif
-#endif
+    CGU_PROC = 1; /* fclk = PLLA = 248 MHz */
 
     asm volatile(
         "mov r0, #0               \n"
@@ -243,16 +238,17 @@ void system_init(void)
     VIC_INT_ENABLE = 0; /* disable all interrupt lines */
     CGU_PERI |= CGU_VIC_CLOCK_ENABLE;
     VIC_INT_SELECT = 0; /* only IRQ, no FIQ */
-
-    enable_irq();
 #else
     /* Disable fast hardware power-off, to use power button normally
      * We don't need the power button in the bootloader. */
     ascodec_init();
     ascodec_write(AS3514_CVDD_DCDC3, ascodec_read(AS3514_CVDD_DCDC3) & (1<<2));
-
 #endif /* BOOTLOADER */
 
+#ifdef HAVE_ADJUSTABLE_CPU_FREQ
+    set_cpu_frequency(CPUFREQ_DEFAULT);
+#endif
+
     dma_init();
 }
 
diff --git a/firmware/target/arm/as3525/system-target.h b/firmware/target/arm/as3525/system-target.h
index 2309b9790f..53bd4cb1b4 100644
--- a/firmware/target/arm/as3525/system-target.h
+++ b/firmware/target/arm/as3525/system-target.h
@@ -23,8 +23,8 @@
 
 #include "system-arm.h"
 
-#define CPUFREQ_MAX     240000000
-#define CPUFREQ_DEFAULT 24000000
-#define CPUFREQ_NORMAL  30000000
+#define CPUFREQ_MAX     248000000
+#define CPUFREQ_DEFAULT 24800000
+#define CPUFREQ_NORMAL  31000000
 
 #endif /* SYSTEM_TARGET_H */