From: yangkai <yangkai@ubuntu-fs>
Date: Wed, 16 Mar 2011 14:14:14 +0000 (+0800)
Subject: update ddr delayus
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ddb1adbaa9722b9d578cac1564d19d242fcf1092;p=firefly-linux-kernel-4.4.55.git

update ddr delayus
---

diff --git a/arch/arm/mach-rk29/ddr.c b/arch/arm/mach-rk29/ddr.c
index 89a9fd43c9c9..2653fb07e6c1 100755
--- a/arch/arm/mach-rk29/ddr.c
+++ b/arch/arm/mach-rk29/ddr.c
@@ -568,10 +568,10 @@ Cpu highest frequency is 1.2 GHz
 void __sramlocalfunc delayus(uint32_t us)
 {	
      uint32_t count;
-     if(cpu_freq == 600)
-         count = us * 150;//533;
+     if(cpu_freq == 24)
+         count = us * 6;//533;
      else
-        count = us*6;
+        count = us*200;
      while(count--)  // 3 cycles
 	 	barrier();
 
@@ -1015,8 +1015,10 @@ void __sramfunc ddr_change_freq(uint32_t nMHz)
 
     local_irq_save(flags);
     //ddr_print("%s enter\n", __func__);
-    cpu_freq = clk_get_rate(clk_get(NULL,"core"));
-    cpu_freq = cpu_freq/1000000;
+    if((pSCU_Reg->CRU_MODE_CON & 0x03) == 0x03)
+        cpu_freq = 24;
+    else 
+        cpu_freq = clk_get_rate(clk_get(NULL,"core"))/1000000;
     
     ret = ddr_set_pll(nMHz, 0);
     ddr_get_parameter(ret);