Revert "add mobile ddr to Kconfig"

This reverts commit 55390a6b985cc3fece52cac3e37b6f9e72fa8648.

diff --git a/arch/arm/mach-rk29/Kconfig b/arch/arm/mach-rk29/Kconfig
index 626262883325f839096752235a7bdd424f1a58cc..a6c10edb6ed454377751574b3757f1d6645ef586 100755 (executable)
--- a/arch/arm/mach-rk29/Kconfig
+++ b/arch/arm/mach-rk29/Kconfig
@@ -56,12 +56,7 @@ choice DDR_TYPE
 config DDR_TYPE_DDRII
        bool "DDRII"
        help
-         Support for DDRII memory
-
-config DDR_TYPE_LPDDR
-       bool "mobile DDR"
-       help
-         Support for mobile DDR, MCP device
+         Spport for DDRII memory
 
 config DDR_TYPE_DDR3_800D
        bool "DDR3-800 5-5-5"
@@ -127,7 +122,7 @@ config DDR_TYPE_DDR3_2133N
        bool "DDR3-2133 14-14-14"
 
 config DDR_TYPE_DDR3_DEFAULT
-       bool "DDR3 (Type unknow)"
+       bool "DDR3 Type unknow"
 
 endchoice
 

diff --git a/arch/arm/mach-rk29/ddr.c b/arch/arm/mach-rk29/ddr.c
index f0fb89cd7cce27c72dbce4f4f16ad6bac863a873..d4772f86f12f12e4b3ce170061a42be82817ab07 100755 (executable)
--- a/arch/arm/mach-rk29/ddr.c
+++ b/arch/arm/mach-rk29/ddr.c
@@ -41,100 +41,6 @@
 
 #ifdef CONFIG_DDR_TYPE
 #define DDR3_TYPE CONFIG_DDR_TYPE
-
-#ifdef CONFIG_DDR_TYPE_DDR3_800D
-#define DDR3_TYPE DDR3_800D
-#endif
-
-#ifdef CONFIG_DDR_TYPE_DDR3_800E
-#define DDR3_TYPE DDR3_800E
-#endif
-
-#ifdef CONFIG_DDR_TYPE_DDR3_1066E
-#define DDR3_TYPE DDR3_1066E
-#endif
-
-#ifdef CONFIG_DDR_TYPE_DDR3_1066F
-#define DDR3_TYPE DDR3_1066F
-#endif
-
-#ifdef CONFIG_DDR_TYPE_DDR3_1066G
-#define DDR3_TYPE DDR3_1066G
-#endif
-
-#ifdef CONFIG_DDR_TYPE_DDR3_1333F
-#define DDR3_TYPE DDR3_1333F
-#endif
-
-#ifdef CONFIG_DDR_TYPE_DDR3_1333G
-#define DDR3_TYPE DDR3_1333G
-#endif
-
-#ifdef CONFIG_DDR_TYPE_DDR3_1333H
-#define DDR3_TYPE DDR3_1333H
-#endif
-
-#ifdef CONFIG_DDR_TYPE_DDR3_1333J
-#define DDR3_TYPE DDR3_1333J
-#endif
-
-#ifdef CONFIG_DDR_TYPE_DDR3_1600G
-#define DDR3_TYPE DDR3_1600G
-#endif
-
-#ifdef CONFIG_DDR_TYPE_DDR3_1600H
-#define DDR3_TYPE DDR3_1600H
-#endif
-
-#ifdef CONFIG_DDR_TYPE_DDR3_1600J
-#define DDR3_TYPE DDR3_1600J
-#endif
-
-#ifdef CONFIG_DDR_TYPE_DDR3_1866J
-#define DDR3_TYPE DDR3_1866J
-#endif
-
-#ifdef CONFIG_DDR_TYPE_DDR3_1866K
-#define DDR3_TYPE DDR3_1866K
-#endif
-
-#ifdef CONFIG_DDR_TYPE_DDR3_1866L
-#define DDR3_TYPE DDR3_1866L
-#endif
-
-#ifdef CONFIG_DDR_TYPE_DDR3_1866M
-#define DDR3_TYPE DDR3_1866M
-#endif
-
-#ifdef CONFIG_DDR_TYPE_DDR3_2133K
-#define DDR3_TYPE DDR3_2133K
-#endif
-
-#ifdef CONFIG_DDR_TYPE_DDR3_2133L
-#define DDR3_TYPE DDR3_2133L
-#endif
-
-#ifdef CONFIG_DDR_TYPE_DDR3_2133M
-#define DDR3_TYPE DDR3_2133M
-#endif
-
-#ifdef CONFIG_DDR_TYPE_DDR3_2133N
-#define DDR3_TYPE DDR3_2133N
-#endif
-
-#ifdef CONFIG_DDR_TYPE_DDR3_DEFAULT
-#define DDR3_TYPE DDR3_DEFAULT
-#endif
-
-#if 0
-#ifdef CONFIG_DDR_TYPE_DDRII
-#define DDR3_TYPE DDR_DDRII
-#endif
-
-#ifdef CONFIG_DDR_TYPE_LPDDR
-#define DDR3_TYPE DDR_LPDDR
-#endif
-#endif
 #else
 #define DDR3_TYPE   DDR3_DEFAULT
 #endif

diff --git a/arch/arm/mach-rk29/include/mach/ddr.h b/arch/arm/mach-rk29/include/mach/ddr.h
index c0e49f038a474bfb13e2cc3cbe8264abe014c6b1..3e9cfe1a27b076eba6e353ce61afd4cf97056999 100755 (executable)
--- a/arch/arm/mach-rk29/include/mach/ddr.h
+++ b/arch/arm/mach-rk29/include/mach/ddr.h
@@ -304,8 +304,6 @@
 #define DDR3_2133M  (19)    // 13-13-13
 #define DDR3_2133N  (20)    // 14-14-14
 #define DDR3_DEFAULT (21)
-#define DDR_DDRII   (22)
-#define DDR_LPDDR   (23)
 
 /* DDR Controller register struct */
 typedef volatile struct DDR_REG_Tag