Revert "update defconfig for ddr"

This reverts commit d357f98bf59a659e3e1c116438d2a4ea6514c512.

diff --git a/arch/arm/configs/rk29_sdk_defconfig b/arch/arm/configs/rk29_sdk_defconfig
index 8e5994ef95d12877da82cb86cfc36ed69b3f218e..1fdfa05cbd15c376d61c2a31dea1771ce1830f76 100755 (executable)
--- a/arch/arm/configs/rk29_sdk_defconfig
+++ b/arch/arm/configs/rk29_sdk_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32.27
-# Sat Apr  9 17:01:30 2011
+# Sat Apr  2 10:51:17 2011
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -205,31 +205,7 @@ CONFIG_MACH_RK29SDK=y
 # CONFIG_MACH_RK29_MALATA is not set
 # CONFIG_MACH_RK29_PHONESDK is not set
 # CONFIG_MACH_RK29_A22 is not set
-# CONFIG_DDR_TYPE_DDRII is not set
-# CONFIG_DDR_TYPE_DDR3_800D is not set
-# CONFIG_DDR_TYPE_DDR3_800E is not set
-# CONFIG_DDR_TYPE_DDR3_1066E is not set
-# CONFIG_DDR_TYPE_DDR3_1066F is not set
-# CONFIG_DDR_TYPE_DDR3_1066G is not set
-# CONFIG_DDR_TYPE_DDR3_1333F is not set
-# CONFIG_DDR_TYPE_DDR3_1333G is not set
-# CONFIG_DDR_TYPE_DDR3_1333H is not set
-# CONFIG_DDR_TYPE_DDR3_1333J is not set
-# CONFIG_DDR_TYPE_DDR3_1600G is not set
-# CONFIG_DDR_TYPE_DDR3_1600H is not set
-# CONFIG_DDR_TYPE_DDR3_1600J is not set
-# CONFIG_DDR_TYPE_DDR3_1600K is not set
-# CONFIG_DDR_TYPE_DDR3_1866J is not set
-# CONFIG_DDR_TYPE_DDR3_1866K is not set
-# CONFIG_DDR_TYPE_DDR3_1866L is not set
-# CONFIG_DDR_TYPE_DDR3_1866M is not set
-# CONFIG_DDR_TYPE_DDR3_2133K is not set
-# CONFIG_DDR_TYPE_DDR3_2133L is not set
-# CONFIG_DDR_TYPE_DDR3_2133M is not set
-# CONFIG_DDR_TYPE_DDR3_2133N is not set
-CONFIG_DDR_TYPE_DDR3_DEFAULT=y
 CONFIG_RK29_MEM_SIZE_M=512
-CONFIG_DDR_SDRAM_FREQ=400
 
 #
 # RK29 VPU (Video Processing Unit) support

diff --git a/arch/arm/mach-rk29/Kconfig b/arch/arm/mach-rk29/Kconfig
index a6c10edb6ed454377751574b3757f1d6645ef586..0dd19b836b98e94a1491993770448ce9567c8188 100755 (executable)
--- a/arch/arm/mach-rk29/Kconfig
+++ b/arch/arm/mach-rk29/Kconfig
@@ -51,7 +51,7 @@ endchoice
 
 choice DDR_TYPE
        prompt "DDR Memory Type"
-       default DDR_TYPE_DDR3_DEFAULT 
+       default DDR_TYPE_DDR3_800D
 
 config DDR_TYPE_DDRII
        bool "DDRII"
@@ -127,7 +127,7 @@ config DDR_TYPE_DDR3_DEFAULT
 endchoice
 
 config RK29_MEM_SIZE_M
-       int "DDR Memory size (in MB)"
+       int "Memory size (in MB)"
        default 512
 
 config DDR_SDRAM_FREQ

diff --git a/arch/arm/mach-rk29/ddr.c b/arch/arm/mach-rk29/ddr.c
index d4772f86f12f12e4b3ce170061a42be82817ab07..acaccd22969f08818a9009da10d997f9fc81f1ce 100755 (executable)
--- a/arch/arm/mach-rk29/ddr.c
+++ b/arch/arm/mach-rk29/ddr.c
@@ -1121,7 +1121,7 @@ static int __init ddr_probe(void)
                  ((capability<<value)>>20));
 
     value = ddr_change_freq(DDR_FREQ);
-    ddr_print("init success!!! freq=%dMHz\n", value);
+    ddr_print("init success!!! freq=%dMHz\n", DDR_FREQ);
     ddr_print("CSR:0x%x, RSLR0:0x%x, RSLR1:0x%x, RDGR0:0x%x, RDGR1:0x%x\n", 
                         pDDR_Reg->CSR, 
                         pDDR_Reg->RSLR[0], pDDR_Reg->RSLR[1],