revert r28834 because it causes problems with uSD

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

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)
                     return 0;
             }
         case CLK_I2C:
-#if CONFIG_CPU == AS3525
-            if (cpu_frequency == CPUFREQ_MAX)
-                return calc_freq(CLK_PCLK)/AS3525_I2C_PRESCALER_BOOSTED;
-            else
-#endif
-                return calc_freq(CLK_PCLK)/AS3525_I2C_PRESCALER;
+            return calc_freq(CLK_PCLK)/AS3525_I2C_PRESCALER;
         case CLK_I2SI:
             switch((CGU_AUDIO>>12) & 3) {
                 case 0:
@@ -223,7 +218,7 @@ static int calc_freq(int clk)
         case CLK_SD_MCLK_MSD:
             if(!(MCI_SD & (1<<8)))
                 return 0;
-            else if(MCI_SD & (1<<10)) /* bypass */
+            else if(MCI_SD & (1<<10))
                 return calc_freq(CLK_PCLK);
             else
             return calc_freq(CLK_PCLK)/(((MCI_SD & 0xff)+1)*2);
@@ -352,7 +347,7 @@ bool __dbg_hw_info(void)
             calc_freq(CLK_SD_MCLK_NAND)/1000000);
 #ifdef HAVE_MULTIDRIVE
         lcd_putsf(0, line++, "uSD :%3dMHz    %3dMHz",
-            ((calc_freq(CLK_PCLK)/ 1000000) /
+            ((AS3525_PCLK_FREQ/ 1000000) /
             ((last_sd & MCI_CLOCK_BYPASS) ? 1: (((last_sd & 0xff) + 1) * 2))),
             calc_freq(CLK_SD_MCLK_MSD)/1000000);
 #endif