s5pc110: mmc: bug fixed

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>

diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index 3b8b49a..82b400c 100644 (file)
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -230,8 +230,6 @@ int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                        if (!mmc)
                                return 1;
 
-                       mmc_init(mmc);
-
                        /*
                         * BOOT_CONFIG[179]
                         * BOOT_ACK[6]
@@ -253,6 +251,8 @@ int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                         *      0x7: Access to General Purpose partition 4
                         */
                        mmc->boot_config = (ack << 6) | (enable << 3) | access;
+
+                       mmc_init(mmc);
                } else {
                        printf("Usage:\n%s\n", cmdtp->usage);
                        rc = 1;

diff --git a/drivers/mmc/s5p_mmc.c b/drivers/mmc/s5p_mmc.c
index b988fdc..74b346e 100644 (file)
--- a/drivers/mmc/s5p_mmc.c
+++ b/drivers/mmc/s5p_mmc.c
@@ -361,7 +361,7 @@ static void mmc_set_ios(struct mmc *mmc)
         */
 
        if (mmc->boot_config & 0x7)
-               val = TX_DELAY2 | RX_DELAY2;
+               val = TX_DELAY2 | RX_DELAY1;
        else
                val = TX_DELAY2 | RX_DELAY3;