From 0e77ccf116e81b0ed2d7a2e4381d41b17c466399 Mon Sep 17 00:00:00 2001
From: hxy/ubuntu <hxy@rockchip.com>
Date: Fri, 6 May 2011 11:41:11 +0800
Subject: [PATCH] config mobile sdk to new ddr version

---
 arch/arm/configs/rk29_phonesdk_defconfig | 36 ++++++++++++++++++++----
 arch/arm/mach-rk29/board-rk29-phonesdk.c |  2 ++
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/arch/arm/configs/rk29_phonesdk_defconfig b/arch/arm/configs/rk29_phonesdk_defconfig
index 7abcc0991198..73f94b19d401 100755
--- a/arch/arm/configs/rk29_phonesdk_defconfig
+++ b/arch/arm/configs/rk29_phonesdk_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32.27
-# Tue May  3 16:05:36 2011
+# Fri May  6 11:36:42 2011
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -204,7 +204,32 @@ CONFIG_WIFI_CONTROL_FUNC=y
 # CONFIG_MACH_RK29_MALATA is not set
 CONFIG_MACH_RK29_PHONESDK=y
 # CONFIG_MACH_RK29_A22 is not set
+# CONFIG_DDR_TYPE_DDRII is not set
+CONFIG_DDR_TYPE_LPDDR=y
+# 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 is not set
 CONFIG_RK29_MEM_SIZE_M=512
+CONFIG_DDR_SDRAM_FREQ=200
 
 #
 # RK29 VPU (Video Processing Unit) support
@@ -1135,6 +1160,7 @@ CONFIG_SOC_CAMERA=y
 # CONFIG_SOC_CAMERA_OV2655 is not set
 CONFIG_SOC_CAMERA_OV2659=y
 # CONFIG_SOC_CAMERA_OV9650 is not set
+# CONFIG_SOC_CAMERA_OV2640 is not set
 # CONFIG_SOC_CAMERA_OV3640 is not set
 CONFIG_SOC_CAMERA_OV5642=y
 CONFIG_OV5642_AUTOFOCUS=y
@@ -1266,6 +1292,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_WM831X=y
 # CONFIG_BACKLIGHT_RK29_BL is not set
 CONFIG_FIH_TOUCHKEY_LED=y
+# CONFIG_BACKLIGHT_AW9364 is not set
 
 #
 # Display device support
@@ -1296,12 +1323,9 @@ CONFIG_LCD_LS035Y8DX02A=y
 # CONFIG_LCD_AT070TNA2 is not set
 
 #
-# HDMI support
+# HDMI
 #
-#CONFIG_HDMI is not set
-#CONFIG_ANX7150 is not set
-# CONFIG_ANX9030 is not set
-# CONFIG_HDMI_DEBUG is not set
+# CONFIG_HDMI is not set
 
 #
 # Console display driver support
diff --git a/arch/arm/mach-rk29/board-rk29-phonesdk.c b/arch/arm/mach-rk29/board-rk29-phonesdk.c
index 0af0074b720d..ed5c31d3d444 100755
--- a/arch/arm/mach-rk29/board-rk29-phonesdk.c
+++ b/arch/arm/mach-rk29/board-rk29-phonesdk.c
@@ -43,6 +43,7 @@
 #include <media/soc_camera.h>                               /* ddl@rock-chips.com : camera support */
 #include <mach/vpu_mem.h>
 #include <mach/sram.h>
+#include <mach/ddr.h>
 
 #include <linux/regulator/rk29-pwm-regulator.h>
 #include <linux/regulator/machine.h>
@@ -3119,6 +3120,7 @@ static void __init machine_rk29_mapio(void)
 	rk29_sram_init();
 	rk29_clock_init(periph_pll_288mhz);
 	rk29_iomux_init();
+    ddr_init(DDR_TYPE,DDR_FREQ);  // DDR3_1333H, 400
 }
 
 MACHINE_START(RK29, "RK29board")
-- 
2.34.1