headers
mailer | 1 Apr 2010 04:39
Favicon

funman: r25413 - in trunk/firmware: export/config target/arm/as3525

Date: 2010-04-01 04:39:25 +0200 (Thu, 01 Apr 2010)
New Revision: 25413

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

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

Modified:
   trunk/firmware/export/config/sansaclipplus.h
   trunk/firmware/export/config/sansaclipv2.h
   trunk/firmware/export/config/sansafuzev2.h
   trunk/firmware/target/arm/as3525/clock-target.h
   trunk/firmware/target/arm/as3525/system-as3525.c

Modified: trunk/firmware/export/config/sansaclipplus.h
===================================================================
--- trunk/firmware/export/config/sansaclipplus.h	2010-03-31 20:54:04 UTC (rev 25412)
+++ trunk/firmware/export/config/sansaclipplus.h	2010-04-01 02:39:25 UTC (rev 25413)
 <at>  <at>  -161,7 +161,7  <at>  <at> 
 #define ROM_START 0x00000000

 /* Define this to the CPU frequency */
-#define CPU_FREQ      250000000
+#define CPU_FREQ      240000000

 /* Type of LCD */
 #define CONFIG_LCD LCD_SSD1303
 <at>  <at>  -188,7 +188,7  <at>  <at>
(Continue reading)

Permalink | Reply | 0 comments |
headers
mailer | 1 Apr 2010 05:14
Favicon

Blue_Dude: r25414 - in trunk: apps apps/gui apps/keymaps apps/lang apps/menus firmware/export/config

Date: 2010-04-01 05:14:44 +0200 (Thu, 01 Apr 2010)
New Revision: 25414

Log Message:
FS#11081 - Hotkey patch.  Many targets supported, but some keymaps need work before they can be switched on

Modified:
   trunk/apps/action.h
   trunk/apps/features.txt
   trunk/apps/gui/wps.c
   trunk/apps/keymaps/keymap-av300.c
   trunk/apps/keymaps/keymap-c100.c
   trunk/apps/keymaps/keymap-c200.c
   trunk/apps/keymaps/keymap-clip.c
   trunk/apps/keymaps/keymap-creativezv.c
   trunk/apps/keymaps/keymap-creativezvm.c
   trunk/apps/keymaps/keymap-e200.c
   trunk/apps/keymaps/keymap-fuze.c
   trunk/apps/keymaps/keymap-gigabeat-s.c
   trunk/apps/keymaps/keymap-gigabeat.c
   trunk/apps/keymaps/keymap-h10.c
   trunk/apps/keymaps/keymap-h1x0_h3x0.c
   trunk/apps/keymaps/keymap-hdd1630.c
   trunk/apps/keymaps/keymap-hdd6330.c
   trunk/apps/keymaps/keymap-iaudio67.c
   trunk/apps/keymaps/keymap-ipod.c
   trunk/apps/keymaps/keymap-m3.c
   trunk/apps/keymaps/keymap-meizu-m6sl.c
   trunk/apps/keymaps/keymap-mini2440.c
   trunk/apps/keymaps/keymap-mr100.c
(Continue reading)

Permalink | Reply | 0 comments |
headers
mailer | 1 Apr 2010 05:22
Favicon

funman: r25415 - trunk/firmware/target/arm/as3525

Date: 2010-04-01 05:22:49 +0200 (Thu, 01 Apr 2010)
New Revision: 25415

Log Message:
as3525*: set up CGU_COUNT register before turning on / modifying PLLs

Write the setting before enabling the PLL
Fix booting problem (black screen) with Clip+

Modified:
   trunk/firmware/target/arm/as3525/system-as3525.c

Modified: trunk/firmware/target/arm/as3525/system-as3525.c
===================================================================
--- trunk/firmware/target/arm/as3525/system-as3525.c	2010-04-01 03:14:44 UTC (rev 25414)
+++ trunk/firmware/target/arm/as3525/system-as3525.c	2010-04-01 03:22:49 UTC (rev 25415)
 <at>  <at>  -262,13 +262,15  <at>  <at> 
         "mcr p15, 0, r0, c1, c0   \n"
         : : : "r0" );

+    CGU_COUNTA = 0xff;
+    CGU_PLLA = AS3525_PLLA_SETTING;
     CGU_PLLASUP = 0;        /* enable PLLA */
-    CGU_PLLA = AS3525_PLLA_SETTING;
     while(!(CGU_INTCTRL & (1<<0)));           /* wait until PLLA is locked */

 #if (AS3525_MCLK_SEL == AS3525_CLK_PLLB)
+    CGU_COUNTB = 0xff;
+    CGU_PLLB = AS3525_PLLB_SETTING;
     CGU_PLLBSUP = 0;        /* enable PLLB */
(Continue reading)

Permalink | Reply | 0 comments |
headers
mailer | 1 Apr 2010 05:55
Favicon

funman: r25416 - trunk/firmware/target/arm/as3525

Date: 2010-04-01 05:55:49 +0200 (Thu, 01 Apr 2010)
New Revision: 25416

Log Message:
as3525*: make sure fclk is 24MHz before using it as the clock source for pclk

Should fix Clip+ boot problems once for all

Modified:
   trunk/firmware/target/arm/as3525/system-as3525.c

Modified: trunk/firmware/target/arm/as3525/system-as3525.c
===================================================================
--- trunk/firmware/target/arm/as3525/system-as3525.c	2010-04-01 03:22:49 UTC (rev 25415)
+++ trunk/firmware/target/arm/as3525/system-as3525.c	2010-04-01 03:55:49 UTC (rev 25416)
 <at>  <at>  -254,6 +254,7  <at>  <at> 
     CCU_SCON = 1; /* AHB master's priority configuration :
                      TIC (Test Interface Controller) > DMA > USB > IDE > ARM */

+    CGU_PROC = 0;           /* fclk 24 MHz */
     CGU_PERI &= ~0x7f;      /* pclk 24 MHz */

     asm volatile(

_______________________________________________
rockbox-cvs mailing list
rockbox-cvs <at> cool.haxx.se
http://cool.haxx.se/cgi-bin/mailman/listinfo/rockbox-cvs
(Continue reading)

Permalink | Reply | 0 comments |
headers
mailer | 1 Apr 2010 06:37
Favicon

funman: r25417 - trunk/firmware/target/arm/as3525

Date: 2010-04-01 06:37:17 +0200 (Thu, 01 Apr 2010)
New Revision: 25417

Log Message:
Fix boosting on as3525v2

the arm926-ejs doesn't have synchronous/asynchronous/fastbus modes, so
just change CGU_PROC directly

Note: we could use a lower unboosted frequency now

Modified:
   trunk/firmware/target/arm/as3525/clock-target.h
   trunk/firmware/target/arm/as3525/debug-as3525.c
   trunk/firmware/target/arm/as3525/system-as3525.c

Modified: trunk/firmware/target/arm/as3525/clock-target.h
===================================================================
--- trunk/firmware/target/arm/as3525/clock-target.h	2010-04-01 03:55:49 UTC (rev 25416)
+++ trunk/firmware/target/arm/as3525/clock-target.h	2010-04-01 04:37:17 UTC (rev 25417)
 <at>  <at>  -120,6 +120,7  <at>  <at> 
 /* FCLK */
 #define AS3525_FCLK_SEL          AS3525_CLK_PLLA
 #define AS3525_FCLK_POSTDIV      (CLK_DIV((AS3525_PLLA_FREQ*(8-AS3525_FCLK_PREDIV)/8),
AS3525_FCLK_FREQ) - 1) /*div=1/(n+1)*/
+#define AS3525_FCLK_POSTDIV_UNBOOSTED      (CLK_DIV((AS3525_PLLA_FREQ*(8-AS3525_FCLK_PREDIV)/8),
CPUFREQ_NORMAL) - 1) /*div=1/(n+1) : needed for as3525v2 */

 /* MCLK */
 #define AS3525_MCLK_SEL          AS3525_CLK_PLLA
(Continue reading)

Permalink | Reply | 0 comments |
headers
mailer | 1 Apr 2010 08:05
Favicon

funman: r25418 - trunk/firmware/target/arm/as3525

Date: 2010-04-01 08:05:24 +0200 (Thu, 01 Apr 2010)
New Revision: 25418

Log Message:
as3525v2: assume plla is the source for pclk (verified with timer frequency)

The frequencies are correctly displayed in the debug menu

Modified:
   trunk/firmware/target/arm/as3525/clock-target.h
   trunk/firmware/target/arm/as3525/debug-as3525.c

Modified: trunk/firmware/target/arm/as3525/clock-target.h
===================================================================
--- trunk/firmware/target/arm/as3525/clock-target.h	2010-04-01 04:37:17 UTC (rev 25417)
+++ trunk/firmware/target/arm/as3525/clock-target.h	2010-04-01 06:05:24 UTC (rev 25418)
 <at>  <at>  -70,7 +70,11  <at>  <at> 
 #define AS3525_FCLK_FREQ        AS3525_PLLA_FREQ

 /* XXX: CGU_PERI might also be different (i.e. no PCLK_DIV1_SEL), but if we use
- * the same frequency for DRAM & PCLK it's not a problem as the bit is unset */
+ * the same frequency for DRAM & PCLK it's not a problem as the bit is unset
+ *
+ * Note that setting bits 1:0 have no effect and they always read back as 0
+ * Perhaps it means CGU_PERI defaults to PLLA as source ?
+ */
 #define AS3525_DRAM_FREQ        60000000    /* Initial DRAM frequency  */
 #define AS3525_PCLK_FREQ        AS3525_DRAM_FREQ/1

Modified: trunk/firmware/target/arm/as3525/debug-as3525.c
(Continue reading)

Permalink | Reply | 0 comments |
headers
mailer | 1 Apr 2010 09:26
Favicon

funman: r25419 - trunk/tools

Date: 2010-04-01 09:26:47 +0200 (Thu, 01 Apr 2010)
New Revision: 25419

Log Message:
Promote Fuzev2 to unstable

Modified:
   trunk/tools/builds.pm

Modified: trunk/tools/builds.pm
===================================================================
--- trunk/tools/builds.pm	2010-04-01 06:05:24 UTC (rev 25418)
+++ trunk/tools/builds.pm	2010-04-01 07:26:47 UTC (rev 25419)
 <at>  <at>  -258,6 +258,11  <at>  <at> 
         name => 'SanDisk Sansa Fuze',
         status => 3,
     },
+    'sansafuzev2' => {
+        name => 'SanDisk Sansa Fuze v2',
+        status => 2,
+        icon => 'sansafuze',
+    },
     'sansam200' => {
         name => 'SanDisk Sansa m200',
         status => 1,

_______________________________________________
rockbox-cvs mailing list
rockbox-cvs <at> cool.haxx.se
http://cool.haxx.se/cgi-bin/mailman/listinfo/rockbox-cvs
(Continue reading)

Permalink | Reply | 0 comments |
headers
mailer | 1 Apr 2010 09:40
Favicon

funman: r25420 - trunk/tools

Date: 2010-04-01 09:40:29 +0200 (Thu, 01 Apr 2010)
New Revision: 25420

Log Message:
Remove e200R from daily builds

Modified:
   trunk/tools/builds.pm

Modified: trunk/tools/builds.pm
===================================================================
--- trunk/tools/builds.pm	2010-04-01 07:26:47 UTC (rev 25419)
+++ trunk/tools/builds.pm	2010-04-01 07:40:29 UTC (rev 25420)
 <at>  <at>  -243,12 +243,6  <at>  <at> 
         name => 'SanDisk Sansa e200',
         status => 3,
     },
-    'sansae200r' => {
-        name => 'SanDisk Sansa e200R',
-        status => 3,
-        icon => 'sansae200',
-        manual => 'sansae200',
-    },
     'sansae200v2' => {
         name => 'SanDisk Sansa e200 v2',
         status => 3,

_______________________________________________
rockbox-cvs mailing list
rockbox-cvs <at> cool.haxx.se
(Continue reading)

Permalink | Reply | 0 comments |
headers
mailer | 1 Apr 2010 10:21
Favicon

funman: r25421 - trunk/firmware/target/arm/as3525

Date: 2010-04-01 10:21:21 +0200 (Thu, 01 Apr 2010)
New Revision: 25421

Log Message:
Try to fix problems on Clip+ (not sure why they appear randomly)

Modified:
   trunk/firmware/target/arm/as3525/system-as3525.c

Modified: trunk/firmware/target/arm/as3525/system-as3525.c
===================================================================
--- trunk/firmware/target/arm/as3525/system-as3525.c	2010-04-01 07:40:29 UTC (rev 25420)
+++ trunk/firmware/target/arm/as3525/system-as3525.c	2010-04-01 08:21:21 UTC (rev 25421)
 <at>  <at>  -255,7 +255,13  <at>  <at> 
                      TIC (Test Interface Controller) > DMA > USB > IDE > ARM */

     CGU_PROC = 0;           /* fclk 24 MHz */
+#if CONFIG_CPU == AS3525v2
+    /* pclk is always based on PLLA, since we don't know the current PLLA speed,
+     * avoid having pclk too fast and hope it's not too low */
+    CGU_PERI |= 0xf << 2;   /* pclk lowest */
+#else
     CGU_PERI &= ~0x7f;      /* pclk 24 MHz */
+#endif

     /* bits 31:30 should be set to 0 in arm926-ejs */
     asm volatile(

_______________________________________________
rockbox-cvs mailing list
(Continue reading)

Permalink | Reply | 0 comments |
headers
mailer | 1 Apr 2010 10:29
Favicon

funman: r25422 - trunk/firmware/target/arm/as3525/sansa-fuzev2

Date: 2010-04-01 10:29:30 +0200 (Thu, 01 Apr 2010)
New Revision: 25422

Log Message:
Fuzev2 LCD: replace delays by calls to lcd_delay() (delays not changed)

Modified:
   trunk/firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c

Modified: trunk/firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c
===================================================================
--- trunk/firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c	2010-04-01 08:21:21 UTC (rev 25421)
+++ trunk/firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c	2010-04-01 08:29:30 UTC (rev 25422)
 <at>  <at>  -115,7 +115,6  <at>  <at> 

 static inline void dbop_set_mode(int mode)
 {
-    int delay = 10;
     unsigned long ctrl = DBOP_CTRL;
     int words = (ctrl >> 13) & 3; // bits 14:13
     if (mode == 32 && words != 2)
 <at>  <at>  -124,7 +123,7  <at>  <at> 
         DBOP_CTRL = (ctrl & ~(1<<14)) | (1<<13); // 2 serial words
     else
         return;
-    while(delay--) asm volatile("nop");
+    lcd_delay(10);
 }

 static void dbop_write_data(const int16_t* p_bytes, int count)
(Continue reading)

Permalink | Reply | 0 comments |

Gmane