rk3188: fix ddr_get_cap
author黄涛 <huangtao@rock-chips.com>
Wed, 23 Jan 2013 16:40:48 +0000 (00:40 +0800)
committer黄涛 <huangtao@rock-chips.com>
Wed, 23 Jan 2013 16:40:48 +0000 (00:40 +0800)
arch/arm/mach-rk30/common.c
arch/arm/mach-rk30/ddr.c

index ce0b83ee0de9a414db5fb4c62692b9a83de06ba5..6a0bc268cacc9f4ae208fe6328fbc00e9acb4247 100755 (executable)
@@ -178,9 +178,6 @@ void __init rk30_map_io(void)
 
 static __init u32 rk30_get_ddr_size(void)
 {
-#ifdef CONFIG_ARCH_RK3188
-       return SZ_2G;
-#endif
        u32 size;
        u32 v[3], a[3];
        u32 pgtbl = PAGE_OFFSET + TEXT_OFFSET - 0x4000;
index cc5fd5a4d5b2440be983064921bfee8d9f3a8f47..a5f33ac04a1a5490ba62a350ca2a367a7ec5ccc5 100755 (executable)
@@ -3321,7 +3321,11 @@ uint32 ddr_get_cap(void)
             break;
     }
     row = ddr_cfg_2_rbc[i].row;
+#ifdef CONFIG_ARCH_RK3188
+    if (1)
+#else
     if(*(volatile uint32_t *)(ROM_CHIP_ID_ADDR+0x0c)  == 0x56313030)
+#endif
     {
         if(pGRF_Reg_RK3066B->GRF_SOC_CON[2] &  (1<<1))
         {