diff options
| author | Rafaël Carré <rafael.carre@gmail.com> | 2010-02-08 03:36:53 +0000 |
|---|---|---|
| committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-02-08 03:36:53 +0000 |
| commit | 71e77aaff8cbfcb95205171d413d572a14304f94 (patch) | |
| tree | 29e30fd33f074937aa19a10a325a63e3c25e9c38 /firmware/target/arm | |
| parent | fbc59e2e2859d7e1d93b3416dad5199cb9def536 (diff) | |
Sansa Clip+: use correct SSP settings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24559 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm')
| -rw-r--r-- | firmware/target/arm/as3525/clock-target.h | 7 | ||||
| -rw-r--r-- | firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/firmware/target/arm/as3525/clock-target.h b/firmware/target/arm/as3525/clock-target.h index 2c3632c8be..9f436f742a 100644 --- a/firmware/target/arm/as3525/clock-target.h +++ b/firmware/target/arm/as3525/clock-target.h @@ -141,6 +141,8 @@ #define AS3525_I2C_FREQ 400000 #define AS3525_SD_IDENT_DIV ((CLK_DIV(AS3525_PCLK_FREQ, AS3525_SD_IDENT_FREQ) / 2) - 1) #define AS3525_SD_IDENT_FREQ 400000 /* must be between 100 & 400 kHz */ + #define AS3525_SSP_PRESCALER ((CLK_DIV(AS3525_PCLK_FREQ, AS3525_SSP_FREQ) + 1) & ~1) /* must be an even number */ + #define AS3525_SSP_FREQ 12000000 #define AS3525_IDE_SEL AS3525_CLK_PLLA /* Input Source */ #define AS3525_IDE_DIV (CLK_DIV(AS3525_PLLA_FREQ, AS3525_IDE_FREQ) - 1)/*div=1/(n+1)*/ @@ -179,6 +181,11 @@ #error I2C frequency is too low : clock divider will not fit ! #endif +/* AS3525_SSP_FREQ */ +#if (((CLK_DIV(AS3525_PCLK_FREQ, AS3525_SSP_FREQ)) + 1 ) & ~1) >= (1<<8) /* 8 bits */ +#error SSP frequency is too low : clock divider will not fit ! +#endif + /* AS3525_SD_IDENT_FREQ */ #if ((CLK_DIV(AS3525_PCLK_FREQ, AS3525_SD_IDENT_FREQ) / 2) - 1) >= (1<<8) /* 8 bits */ #error SD IDENTIFICATION frequency is too low : clock divider will not fit ! diff --git a/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c b/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c index b1aeee93ba..ce8df9e52d 100644 --- a/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c +++ b/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c @@ -97,9 +97,9 @@ static void lcd_hw_init(void) #elif defined(SANSA_CLIPPLUS) CGU_PERI |= CGU_SSP_CLOCK_ENABLE; - SSP_CPSR; /* No clock prescale */ - SSP_CR0 = 0 | 7; /* Motorola SPI frame format, 8 bits */ - SSP_CR1 = 1<<1; /* SSP Operation enabled */ + SSP_CPSR = AS3525_SSP_PRESCALER; /* OF = 0x10 */ + SSP_CR0 = (1<<7) | (1<<6) | 7; /* Motorola SPI frame format, 8 bits */ + SSP_CR1 = (1<<3) | (1<<1); /* SSP Operation enabled */ SSP_IMSC = 0; /* No interrupts */ #endif } |