ARM: SAMSUNG: support sdhci controller

To support sdhci controller, remove the CONFIG_S5P_MMC..
Instead, use the CONFIG_S5P_SDHCI/CONFIG_SDHCI.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Lei Wen<leiwen@marvell.com>
Acked-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/include/configs/origen.h b/include/configs/origen.h
index 8ede82575c74136ccbb54f1b254135d04c24eb82..367f991848b3119e6d14cf0cfb6c7408f4ddbcfe 100644 (file)
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -69,9 +69,10 @@
 #define EXYNOS4_DEFAULT_UART_OFFSET    0x020000
 
 /* SD/MMC configuration */
-#define CONFIG_GENERIC_MMC             1
-#define CONFIG_MMC                     1
-#define CONFIG_S5P_MMC                 1
+#define CONFIG_GENERIC_MMC
+#define CONFIG_MMC
+#define CONFIG_SDHCI
+#define CONFIG_S5P_SDHCI
 
 /* PWM */
 #define CONFIG_PWM                     1

diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 56b5547fd27d8794a19338ecc22f1edbdeb67075..e133a17259c360491593c4f7f09cb088c70798ed 100644 (file)
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -63,9 +63,10 @@
 #define CONFIG_BAUDRATE                        115200
 
 /* MMC */
-#define CONFIG_GENERIC_MMC             1
-#define CONFIG_MMC                     1
-#define CONFIG_S5P_MMC                 1
+#define CONFIG_GENERIC_MMC
+#define CONFIG_MMC
+#define CONFIG_SDHCI
+#define CONFIG_S5P_SDHCI
 
 /* PWM */
 #define CONFIG_PWM                     1

diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 13012756ab5b3c4c94350f10d64cc3436014d9f5..00db374182f4cc059254be53e5e6ef7af94ac9f0 100644 (file)
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -66,9 +66,10 @@
 #define CONFIG_BAUDRATE                115200
 
 /* MMC */
-#define CONFIG_GENERIC_MMC     1
-#define CONFIG_MMC             1
-#define CONFIG_S5P_MMC         1
+#define CONFIG_GENERIC_MMC
+#define CONFIG_MMC
+#define CONFIG_SDHCI
+#define CONFIG_S5P_SDHCI
 
 /* PWM */
 #define CONFIG_PWM                     1

diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index 9659f9ebd9a44a3cc5e480c1afc850979449be86..0f63040d259d9cba0acb85f1e229a939c4b5bfab 100644 (file)
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -78,7 +78,8 @@
 /* SD/MMC configuration */
 #define CONFIG_GENERIC_MMC
 #define CONFIG_MMC
-#define CONFIG_S5P_MMC
+#define CONFIG_SDHCI
+#define CONFIG_S5P_SDHCI
 
 #define CONFIG_BOARD_EARLY_INIT_F
 

diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index 93c25da1cfb6054cb76802eab55c5b138231f08d..702134bda32ba8ba19a27513dd9286d6408ef3cf 100644 (file)
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -68,9 +68,10 @@
 #define EXYNOS4_DEFAULT_UART_OFFSET    0x010000
 
 /* SD/MMC configuration */
-#define CONFIG_GENERIC_MMC             1
-#define CONFIG_MMC                     1
-#define CONFIG_S5P_MMC                 1
+#define CONFIG_GENERIC_MMC
+#define CONFIG_MMC
+#define CONFIG_SDHCI
+#define CONFIG_S5P_SDHCI
 
 /* PWM */
 #define CONFIG_PWM                     1

diff --git a/include/configs/trats.h b/include/configs/trats.h
index 10f11d95792edb04389b2a3f90d55cd4eaac09d2..71b939396e622d90584d5b12d01ff0edaf523f18 100644 (file)
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -74,7 +74,8 @@
 /* MMC */
 #define CONFIG_GENERIC_MMC
 #define CONFIG_MMC
-#define CONFIG_S5P_MMC
+#define CONFIG_S5P_SDHCI
+#define CONFIG_SDHCI
 
 /* PWM */
 #define CONFIG_PWM