From: 黄涛 <huangtao@rock-chips.com>
Date: Wed, 23 Jan 2013 16:20:45 +0000 (+0800)
Subject: rk3188: fix ddr init
X-Git-Tag: firefly_0821_release~7825
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f61682c81b6d561a825aaa1f204808cbf871e6d7;p=firefly-linux-kernel-4.4.55.git

rk3188: fix ddr init
---

diff --git a/arch/arm/mach-rk30/common.c b/arch/arm/mach-rk30/common.c
index 8c381862348a..ce0b83ee0de9 100755
--- a/arch/arm/mach-rk30/common.c
+++ b/arch/arm/mach-rk30/common.c
@@ -170,9 +170,7 @@ void __init rk30_map_io(void)
 	rk29_sram_init();
 	board_clock_init();
 	rk30_l2_cache_init();
-#ifndef CONFIG_ARCH_RK3188
 	ddr_init(DDR_TYPE, DDR_FREQ);
-#endif
 	clk_disable_unused();
 	rk30_iomux_init();
 	rk30_boot_mode_init();
diff --git a/arch/arm/mach-rk30/ddr.c b/arch/arm/mach-rk30/ddr.c
index 8fbd9d597563..cc5fd5a4d5b2 100755
--- a/arch/arm/mach-rk30/ddr.c
+++ b/arch/arm/mach-rk30/ddr.c
@@ -184,6 +184,7 @@ typedef uint32_t uint32;
 #define idle_req_gpu_cfg    (1<<3)
 #define idle_req_video_cfg  (1<<4)
 #define idle_req_vio_cfg    (1<<5)
+#define idle_req_dma_cfg    (1<<16)
 
 //PMU_PWRDN_ST
 #define idle_cpu    (1<<26)
@@ -191,6 +192,7 @@ typedef uint32_t uint32;
 #define idle_gpu    (1<<24)
 #define idle_video  (1<<23)
 #define idle_vio    (1<<22)
+#define idle_dma    (1<<14)
 
 #define pd_a9_0_pwr_st    (1<<0)
 #define pd_a9_1_pwr_st    (1<<1)
@@ -2989,9 +2991,15 @@ void __sramlocalfunc idle_port(void)
 
     if ( (pPMU_Reg->PMU_PWRDN_ST & pd_a9_0_pwr_st) == 0 )
     {
+        #ifdef CONFIG_ARCH_RK3188
+        pPMU_Reg->PMU_MISC_CON1 |= idle_req_dma_cfg;
+        dsb();
+        while( (pPMU_Reg->PMU_PWRDN_ST & idle_dma) == 0 );
+        #else
         pPMU_Reg->PMU_MISC_CON1 |= idle_req_cpu_cfg;
         dsb();
         while( (pPMU_Reg->PMU_PWRDN_ST & idle_cpu) == 0 );
+        #endif
     }
 
     if ( (pPMU_Reg->PMU_PWRDN_ST & pd_peri_pwr_st) == 0 )
@@ -3042,9 +3050,16 @@ void __sramlocalfunc deidle_port(void)
 
     if ( (pPMU_Reg->PMU_PWRDN_ST & pd_a9_0_pwr_st) == 0 )
     {
+
+        #ifdef CONFIG_ARCH_RK3188
+        pPMU_Reg->PMU_MISC_CON1 &= ~idle_req_dma_cfg;
+        dsb();
+        while( (pPMU_Reg->PMU_PWRDN_ST & idle_dma) != 0 );
+        #else
         pPMU_Reg->PMU_MISC_CON1 &= ~idle_req_cpu_cfg;
         dsb();
         while( (pPMU_Reg->PMU_PWRDN_ST & idle_cpu) != 0 );
+        #endif
     }
     if ( (pPMU_Reg->PMU_PWRDN_ST & pd_peri_pwr_st) == 0 )
     {