diff options
author | Fred Bauer <fred.w.bauer@gmail.com> | 2010-12-29 16:07:15 +0000 |
---|---|---|
committer | Fred Bauer <fred.w.bauer@gmail.com> | 2010-12-29 16:07:15 +0000 |
commit | e541c98a7e19f22ab62a0adb370ea9f4c922e666 (patch) | |
tree | 74aa302fcc9e3c1ea05c9f45ad1724da8badd71e /firmware/target/arm/as3525/debug-as3525.c | |
parent | 7f31e38ac12884db251734482e0d37174c62e40b (diff) | |
download | rockbox-e541c98a7e19f22ab62a0adb370ea9f4c922e666.tar.gz rockbox-e541c98a7e19f22ab62a0adb370ea9f4c922e666.zip |
revert r28834 because it causes problems with uSD
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28925 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/as3525/debug-as3525.c')
-rw-r--r-- | firmware/target/arm/as3525/debug-as3525.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/firmware/target/arm/as3525/debug-as3525.c b/firmware/target/arm/as3525/debug-as3525.c index 9950ccd9c6..513295edcb 100644 --- a/firmware/target/arm/as3525/debug-as3525.c +++ b/firmware/target/arm/as3525/debug-as3525.c | |||
@@ -182,12 +182,7 @@ static int calc_freq(int clk) | |||
182 | return 0; | 182 | return 0; |
183 | } | 183 | } |
184 | case CLK_I2C: | 184 | case CLK_I2C: |
185 | #if CONFIG_CPU == AS3525 | 185 | return calc_freq(CLK_PCLK)/AS3525_I2C_PRESCALER; |
186 | if (cpu_frequency == CPUFREQ_MAX) | ||
187 | return calc_freq(CLK_PCLK)/AS3525_I2C_PRESCALER_BOOSTED; | ||
188 | else | ||
189 | #endif | ||
190 | return calc_freq(CLK_PCLK)/AS3525_I2C_PRESCALER; | ||
191 | case CLK_I2SI: | 186 | case CLK_I2SI: |
192 | switch((CGU_AUDIO>>12) & 3) { | 187 | switch((CGU_AUDIO>>12) & 3) { |
193 | case 0: | 188 | case 0: |
@@ -223,7 +218,7 @@ static int calc_freq(int clk) | |||
223 | case CLK_SD_MCLK_MSD: | 218 | case CLK_SD_MCLK_MSD: |
224 | if(!(MCI_SD & (1<<8))) | 219 | if(!(MCI_SD & (1<<8))) |
225 | return 0; | 220 | return 0; |
226 | else if(MCI_SD & (1<<10)) /* bypass */ | 221 | else if(MCI_SD & (1<<10)) |
227 | return calc_freq(CLK_PCLK); | 222 | return calc_freq(CLK_PCLK); |
228 | else | 223 | else |
229 | return calc_freq(CLK_PCLK)/(((MCI_SD & 0xff)+1)*2); | 224 | return calc_freq(CLK_PCLK)/(((MCI_SD & 0xff)+1)*2); |
@@ -352,7 +347,7 @@ bool __dbg_hw_info(void) | |||
352 | calc_freq(CLK_SD_MCLK_NAND)/1000000); | 347 | calc_freq(CLK_SD_MCLK_NAND)/1000000); |
353 | #ifdef HAVE_MULTIDRIVE | 348 | #ifdef HAVE_MULTIDRIVE |
354 | lcd_putsf(0, line++, "uSD :%3dMHz %3dMHz", | 349 | lcd_putsf(0, line++, "uSD :%3dMHz %3dMHz", |
355 | ((calc_freq(CLK_PCLK)/ 1000000) / | 350 | ((AS3525_PCLK_FREQ/ 1000000) / |
356 | ((last_sd & MCI_CLOCK_BYPASS) ? 1: (((last_sd & 0xff) + 1) * 2))), | 351 | ((last_sd & MCI_CLOCK_BYPASS) ? 1: (((last_sd & 0xff) + 1) * 2))), |
357 | calc_freq(CLK_SD_MCLK_MSD)/1000000); | 352 | calc_freq(CLK_SD_MCLK_MSD)/1000000); |
358 | #endif | 353 | #endif |