ENGR00112273 BBG2: MMC boot support.

BBG2: MMC boot support.

Signed-off-by: Terry Lv <r65388@freescale.com>

3 files changed, 2196 insertions, 58 deletions

diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
index 6fa04b8..afb74ae 100644
--- a/drivers/mmc/Makefile
+++ b/drivers/mmc/Makefile
@@ -32,6 +32,8 @@ COBJS-$(CONFIG_OMAP3_MMC) += omap3_mmc.o
 COBJS-$(CONFIG_FSL_ESDHC) += fsl_esdhc.o
 COBJS-$(CONFIG_MXC_MMC) += mxcmmc.o
 COBJS-$(CONFIG_PXA_MMC) += pxa_mmc.o
+COBJS-$(CONFIG_FSL_MMC) += fsl_mmc.o
+COBJS-$(CONFIG_FSL_MMC) += fsl_esdhc.o
 
 COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index c6e9e6e..9fcce5b 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -1,6 +1,5 @@
 /*
- * Copyright 2007, Freescale Semiconductor, Inc
- * Andy Fleming
+ * Copyright 2008-2009 Freescale Semiconductor, Inc.
  *
  * Based vaguely on the pxa mmc code:
  * (C) Copyright 2003
@@ -25,7 +24,18 @@
  * MA 02111-1307 USA
  */
 
+/*!
+ * @file esdhc.c
+ *
+ * @brief source code for the mmc card operation
+ *
+ * @ingroup mmc
+ */
+
 #include <config.h>
+#include <asm/arch/sdhc.h>
+#include <linux/mmc/sdhci.h>
+#include <asm/errno.h>
 #include <common.h>
 #include <command.h>
 #include <hwconfig.h>
@@ -35,9 +45,9 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <fdt_support.h>
+#include <linux/types.h>
 #include <asm/io.h>
 
-
 DECLARE_GLOBAL_DATA_PTR;
 
 struct fsl_esdhc {
@@ -67,6 +77,41 @@ struct fsl_esdhc {
 	uint	scr;
 };
 
+#define RETRIES_TIMES 100
+
+#define REG_WRITE_OR(val, reg) { \
+		u32 temp = 0; \
+		temp = readl(reg); \
+		(temp) |= (val); \
+		writel((temp), (reg)); \
+		}
+
+#define REG_WRITE_AND(val, reg) { \
+		u32 temp = 0; \
+		temp = readl(reg); \
+		(temp) &= (val); \
+		writel((temp), (reg)); \
+		}
+
+#define SDHC_DELAY_BY_100(x) { \
+		u32 i; \
+		for (i = 0; i < x; ++i) \
+			udelay(100); \
+		}
+
+extern volatile u32 esdhc_base_pointer;
+
+static void esdhc_cmd_config(esdhc_cmd_t *);
+static u32 esdhc_check_response(void);
+static u32 esdhc_wait_buf_rdy_intr(u32, u32);
+static void esdhc_wait_op_done_intr(void);
+static u32 esdhc_check_data(void);
+static void esdhc_set_data_transfer_width(u32 data_transfer_width);
+static u32 esdhc_poll_cihb_cdihb(data_present_select data_present);
+static void esdhc_set_endianness(u32 endian_mode);
+static void esdhc_clear_buf_rdy_intr(u32 mask);
+static u32 esdhc_check_data_crc_status(void);
+
 /* Return the XFERTYP flags for a given command and data packet */
 uint esdhc_xfertyp(struct mmc_cmd *cmd, struct mmc_data *data)
 {
@@ -74,12 +119,9 @@ uint esdhc_xfertyp(struct mmc_cmd *cmd, struct mmc_data *data)
 
 	if (data) {
 		xfertyp |= XFERTYP_DPSEL | XFERTYP_DMAEN;
-
 		if (data->blocks > 1) {
 			xfertyp |= XFERTYP_MSBSEL;
 			xfertyp |= XFERTYP_BCEN;
-		}
-
 		if (data->flags & MMC_DATA_READ)
 			xfertyp |= XFERTYP_DTDSEL;
 	}
@@ -98,20 +140,30 @@ uint esdhc_xfertyp(struct mmc_cmd *cmd, struct mmc_data *data)
 	return XFERTYP_CMD(cmd->cmdidx) | xfertyp;
 }
 
+/*!
+ * Send 80 SD clock to card and wait for INITA bit to get cleared.
+ */
+void interface_initialization_active(void)
+{
+	/* Send 80 clock ticks for card to power up */
+	REG_WRITE_OR(ESDHC_SYSCTL_INITA, \
+			esdhc_base_pointer + SDHCI_SYSTEM_CONTROL);
+
+	/* Start a general purpose timer */
+	udelay(ESDHC_CARD_INIT_TIMEOUT);
+}
+
 static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data)
 {
 	uint wml_value;
 	int timeout;
 	struct fsl_esdhc *regs = mmc->priv;
-
 	wml_value = data->blocksize/4;
 
 	if (data->flags & MMC_DATA_READ) {
 		if (wml_value > 0x10)
 			wml_value = 0x10;
-
 		wml_value = 0x100000 | wml_value;
-
 		out_be32(&regs->dsaddr, (u32)data->dest);
 	} else {
 		if (wml_value > 0x80)
@@ -125,24 +177,158 @@ static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data)
 	}
 
 	out_be32(&regs->wml, wml_value);
-
 	out_be32(&regs->blkattr, data->blocks << 16 | data->blocksize);
-
 	/* Calculate the timeout period for data transactions */
 	timeout = __ilog2(mmc->tran_speed/10);
 	timeout -= 13;
-
 	if (timeout > 14)
 		timeout = 14;
-
 	if (timeout < 0)
 		timeout = 0;
-
 	clrsetbits_be32(&regs->sysctl, SYSCTL_TIMEOUT_MASK, timeout << 16);
-
 	return 0;
 }
 
+/*!
+ * Execute a software reset and set data bus width for eSDHC.
+ */
+u32 interface_reset(void)
+{
+	u32 reset_status = 0;
+	u32 u32Retries = 0;
+	u32 u32Temp = 0;
+
+	debug("Entry: interface_reset");
+
+	/* Reset the entire host controller by writing
+	1 to RSTA bit of SYSCTRL Register */
+	REG_WRITE_OR(ESDHC_SOFTWARE_RESET, \
+			esdhc_base_pointer + SDHCI_SYSTEM_CONTROL);
+
+	/* Start a general purpose timer (3 millsec delay) */
+	/* udelay(ESDHC_OPER_TIMEOUT); */
+
+	/* Wait for clearance of CIHB and CDIHB Bits */
+	for (u32Retries = RETRIES_TIMES; u32Retries > 0; --u32Retries) {
+		if (!is_soc_rev(CHIP_REV_1_0)) {
+			if (readl(esdhc_base_pointer + SDHCI_PRESENT_STATE) \
+						& ESDHC_CMD_INHIBIT) {
+				reset_status = 1;
+			} else {
+				reset_status = 0;
+				break;
+			}
+		} else if (!is_soc_rev(CHIP_REV_2_0)) {
+			if (readl(esdhc_base_pointer + SDHCI_SYSTEM_CONTROL) \
+						& ESDHC_SOFTWARE_RESET) {
+				reset_status = 1;
+			} else {
+				reset_status = 0;
+				break;
+			}
+		}
+	}
+
+	if (!is_soc_rev(CHIP_REV_1_0)) {
+		/* send 80 clock ticks for card to power up */
+		REG_WRITE_OR(ESDHC_SYSCTL_INITA, \
+			esdhc_base_pointer + SDHCI_SYSTEM_CONTROL);
+	}
+
+	/* Set data bus width of ESDCH */
+	esdhc_set_data_transfer_width(0x00000000);
+	/* Set Endianness of ESDHC */
+	esdhc_set_endianness(0x00000020);
+
+	/* set data timeout delay to max */
+	u32Temp = (readl(esdhc_base_pointer + SDHCI_SYSTEM_CONTROL) & \
+						0xfff0ffff) | 0x000e0000;
+	writel(u32Temp, esdhc_base_pointer + SDHCI_SYSTEM_CONTROL);
+
+	return reset_status;
+}
+
+/*!
+ * Clear interrupts at eSDHC level.
+ */
+void interface_clear_interrupt(void)
+{
+	/* Clear Interrupt status register */
+	writel(ESDHC_CLEAR_INTERRUPT, esdhc_base_pointer + SDHCI_INT_STATUS);
+}
+
+/*!
+ * Enable Clock and set operating frequency.
+ */
+void interface_configure_clock(sdhc_freq_t frequency)
+{
+	u32 ident_freq = 0;
+	u32 oper_freq  = 0;
+
+	if (!is_soc_rev(CHIP_REV_1_0)) {
+		/* Enable ipg_perclk, HCLK enable and IPG Clock enable. */
+		REG_WRITE_OR(ESDHC_CLOCK_ENABLE, \
+			esdhc_base_pointer + SDHCI_SYSTEM_CONTROL);
+		/* Clear DTOCV SDCLKFS bits */
+		REG_WRITE_OR(ESDHC_FREQ_MASK, \
+			esdhc_base_pointer + SDHCI_SYSTEM_CONTROL);
+		ident_freq = ESDHC_SYSCTL_IDENT_FREQ_TO1;
+		oper_freq  = ESDHC_SYSCTL_OPERT_FREQ_TO1;
+	} else if (!is_soc_rev(CHIP_REV_2_0)) {
+		/* Clear SDCLKEN bit */
+		REG_WRITE_OR((~ESDHC_SYSCTL_SDCLKEN_MASK), \
+			esdhc_base_pointer + SDHCI_SYSTEM_CONTROL);
+
+		/* Clear DTOCV, SDCLKFS, DVFS bits */
+		REG_WRITE_OR((~ESDHC_SYSCTL_FREQ_MASK), \
+			esdhc_base_pointer + SDHCI_SYSTEM_CONTROL);
+		ident_freq = ESDHC_SYSCTL_IDENT_FREQ_TO2;
+		oper_freq  = ESDHC_SYSCTL_OPERT_FREQ_TO2;
+	}
+
+	if (!is_soc_rev(CHIP_REV_2_0)) {
+		/* Disable the PEREN, HCKEN and IPGEN */
+		REG_WRITE_OR((~ESDHC_SYSCTL_INPUT_CLOCK_MASK), \
+			esdhc_base_pointer + SDHCI_SYSTEM_CONTROL);
+	}
+
+	if (frequency == IDENTIFICATION_FREQ) {
+		/* Input frequecy to eSDHC is 36 MHZ */
+		/* PLL3 is the source of input frequency*/
+		/*Set DTOCV and SDCLKFS bit to get SD_CLK
+		of frequency below 400 KHZ (70.31 KHZ) */
+		REG_WRITE_OR(ident_freq, \
+			esdhc_base_pointer + SDHCI_SYSTEM_CONTROL);
+	} else if (frequency == OPERATING_FREQ) {
+		/*Set DTOCV and SDCLKFS bit to get SD_CLK
+		of frequency around 25 MHz.(18 MHz)*/
+		REG_WRITE_OR(oper_freq, \
+			esdhc_base_pointer + SDHCI_SYSTEM_CONTROL);
+	}
+
+	if (!is_soc_rev(CHIP_REV_2_0)) {
+		/* Start a general purpose timer */
+		/* Wait for clock to be stable */
+		SDHC_DELAY_BY_100(96);
+
+		/* Set SDCLKEN bit to enable clock */
+		REG_WRITE_OR(ESDHC_SYSCTL_SDCLKEN_MASK, \
+			esdhc_base_pointer + SDHCI_SYSTEM_CONTROL);
+
+		/* Mask Data Timeout Error Status Enable Interrupt (DTOESEN) */
+		REG_WRITE_AND((~ESDHC_IRQSTATEN_DTOESEN), \
+			esdhc_base_pointer + SDHCI_INT_ENABLE);
+
+		/* Set the Data Timeout Counter Value(DTOCV) */
+		REG_WRITE_OR(ESDHC_SYSCTL_DTOCV_VAL, \
+			esdhc_base_pointer + SDHCI_SYSTEM_CONTROL);
+
+		/* Enable Data Timeout Error Status
+			Enable Interrupt (DTOESEN) */
+		REG_WRITE_OR(ESDHC_IRQSTATEN_DTOESEN, \
+			esdhc_base_pointer + SDHCI_INT_ENABLE);
+	}
+}
 
 /*
  * Sends a command out on the bus.  Takes the mmc pointer,
@@ -154,24 +340,18 @@ esdhc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data)
 	uint	xfertyp;
 	uint	irqstat;
 	volatile struct fsl_esdhc *regs = mmc->priv;
-
 	out_be32(&regs->irqstat, -1);
-
 	sync();
-
 	/* Wait for the bus to be idle */
 	while ((in_be32(&regs->prsstat) & PRSSTAT_CICHB) ||
 			(in_be32(&regs->prsstat) & PRSSTAT_CIDHB));
-
 	while (in_be32(&regs->prsstat) & PRSSTAT_DLA);
-
 	/* Wait at least 8 SD clock cycles before the next command */
 	/*
 	 * Note: This is way more than 8 cycles, but 1ms seems to
 	 * resolve timing issues with some cards
 	 */
 	udelay(1000);
-
 	/* Set up for a data transfer if we have one */
 	if (data) {
 		int err;
@@ -180,30 +360,23 @@ esdhc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data)
 		if(err)
 			return err;
 	}
-
 	/* Figure out the transfer arguments */
 	xfertyp = esdhc_xfertyp(cmd, data);
-
 	/* Send the command */
 	out_be32(&regs->cmdarg, cmd->cmdarg);
 	out_be32(&regs->xfertyp, xfertyp);
-
 	/* Wait for the command to complete */
 	while (!(in_be32(&regs->irqstat) & IRQSTAT_CC));
 
 	irqstat = in_be32(&regs->irqstat);
 	out_be32(&regs->irqstat, irqstat);
-
 	if (irqstat & CMD_ERR)
 		return COMM_ERR;
-
 	if (irqstat & IRQSTAT_CTOE)
 		return TIMEOUT;
-
 	/* Copy the response to the response buffer */
 	if (cmd->resp_type & MMC_RSP_136) {
 		u32 cmdrsp3, cmdrsp2, cmdrsp1, cmdrsp0;
-
 		cmdrsp3 = in_be32(&regs->cmdrsp3);
 		cmdrsp2 = in_be32(&regs->cmdrsp2);
 		cmdrsp1 = in_be32(&regs->cmdrsp1);
@@ -214,15 +387,12 @@ esdhc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data)
 		cmd->response[3] = (cmdrsp0 << 8);
 	} else
 		cmd->response[0] = in_be32(&regs->cmdrsp0);
-
 	/* Wait until all of the blocks are transferred */
 	if (data) {
 		do {
 			irqstat = in_be32(&regs->irqstat);
-
 			if (irqstat & DATA_ERR)
 				return COMM_ERR;
-
 			if (irqstat & IRQSTAT_DTOE)
 				return TIMEOUT;
 		} while (!(irqstat & IRQSTAT_TC) &&
@@ -230,10 +400,132 @@ esdhc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data)
 	}
 
 	out_be32(&regs->irqstat, -1);
+	return 0;
+}
+
+/*!
+ * Set data transfer width for e-SDHC.
+ */
+static void esdhc_set_data_transfer_width(u32 data_transfer_width)
+{
+	/* Set DWT bit of protocol control register according to bus_width */
+	if (!is_soc_rev(CHIP_REV_2_0))
+		REG_WRITE_AND((~ESDHC_BUS_WIDTH_MASK), \
+			esdhc_base_pointer + SDHCI_HOST_CONTROL);
+
+	REG_WRITE_OR((data_transfer_width), \
+			esdhc_base_pointer + SDHCI_HOST_CONTROL);
+}
+
+/*!
+ * Set endianness mode for e-SDHC.
+ */
+static void esdhc_set_endianness(u32 endian_mode)
+{
+	if (!is_soc_rev(CHIP_REV_2_0)) {
+		REG_WRITE_AND((~ESDHC_ENDIAN_MODE_MASK), \
+			esdhc_base_pointer + SDHCI_HOST_CONTROL);
+	}
+	/* Set DWT bit of protocol control register according to bus_width */
+	REG_WRITE_OR((endian_mode), \
+			esdhc_base_pointer + SDHCI_HOST_CONTROL);
+}
+
+/*!
+ * Poll the CIHB & CDIHB bits of the present
+ * state register and wait until it goes low.
+ */
+static u32 esdhc_poll_cihb_cdihb(data_present_select data_present)
+{
+	u32 init_status = 0;
+	u32 u32Retries = 0;
+
+	/* Start a general purpose timer */
+	for (u32Retries = RETRIES_TIMES; u32Retries > 0; u32Retries--) {
+		if (!(readl(esdhc_base_pointer + SDHCI_PRESENT_STATE) & \
+					ESDHC_PRESENT_STATE_CIHB)) {
+			init_status = 0;
+			break;
+		}
+		SDHC_DELAY_BY_100(10);
+	}
+
+	/*
+	 * Wait for the data line to be free (poll the CDIHB bit of
+	 * the present state register).
+	 */
+	if ((0 == init_status) && (data_present == DATA_PRESENT)) {
+		/* Start a general purpose timer */
+		SDHC_DELAY_BY_100(32);
+
+		if (readl(esdhc_base_pointer + SDHCI_PRESENT_STATE) & \
+			ESDHC_PRESENT_STATE_CDIHB) {
+			init_status =  1;
+		}
+	}
+
+	return init_status;
+}
+
+/*!
+ * Wait until the command and data lines are free.
+ */
+u32 interface_wait_cmd_data_lines(data_present_select data_present)
+{
+	u32 cmd_status = 0;
+
+	cmd_status = esdhc_poll_cihb_cdihb(data_present);
+
+	return cmd_status;
+}
+
+u32 interface_set_bus_width(u32 bus_width)
+{
+	u32 tmp;
+
+	tmp = readl(esdhc_base_pointer + SDHCI_HOST_CONTROL);
+	tmp &= ~SDHCI_CTRL_8BITBUS;
+	tmp |= SDHCI_CTRL_4BITBUS;
+
+	writel(tmp, esdhc_base_pointer + SDHCI_HOST_CONTROL);
 
 	return 0;
 }
 
+/*!
+ * Execute a command and wait for the response.
+ */
+u32 interface_send_cmd_wait_resp(esdhc_cmd_t *cmd)
+{
+	u32 cmd_status = 0;
+
+	/* Clear Interrupt status register */
+	writel(ESDHC_CLEAR_INTERRUPT, \
+			esdhc_base_pointer + SDHCI_INT_STATUS);
+
+	/* Enable Interrupt */
+	REG_WRITE_OR(ESDHC_INTERRUPT_ENABLE, \
+			esdhc_base_pointer + SDHCI_INT_ENABLE);
+	if (!is_soc_rev(CHIP_REV_2_0)) {
+		cmd_status = interface_wait_cmd_data_lines(cmd->data_present);
+
+		if (cmd_status == 1)
+			return 1;
+	}
+
+	/* Configure Command */
+	esdhc_cmd_config(cmd);
+
+	/* Wait for interrupt CTOE or CC */
+	SDHC_DELAY_BY_100(96);
+
+	/* Mask all interrupts */
+	writel(0, esdhc_base_pointer + SDHCI_SIGNAL_ENABLE);
+
+	/* Check if an error occured */
+	return esdhc_check_response();
+}
+
 void set_sysctl(struct mmc *mmc, uint clock)
 {
 	int sdhc_clk = gd->sdhc_clk;
@@ -247,39 +539,178 @@ void set_sysctl(struct mmc *mmc, uint clock)
 				break;
 	} else
 		pre_div = 2;
-
 	for (div = 1; div <= 16; div++)
 		if ((sdhc_clk / (div * pre_div)) <= clock)
 			break;
-
 	pre_div >>= 1;
 	div -= 1;
-
 	clk = (pre_div << 8) | (div << 4);
-
 	clrsetbits_be32(&regs->sysctl, SYSCTL_CLOCK_MASK, clk);
-
 	udelay(10000);
-
 	setbits_be32(&regs->sysctl, SYSCTL_PEREN);
 }
 
+/*!
+ * Configure ESDHC registers for sending a command to MMC.
+ */
+static void esdhc_cmd_config(esdhc_cmd_t *cmd)
+{
+	u32 u32Temp = 0;
+
+	/* Write Command Argument in Command Argument Register */
+	writel(cmd->arg, esdhc_base_pointer + SDHCI_ARGUMENT);
+
+	/*
+	*Configure e-SDHC Register value according to Command
+	*/
+	u32Temp = \
+		(((cmd->data_transfer)<<ESDHC_DATA_TRANSFER_SHIFT) |
+		((cmd->response_format)<<ESDHC_RESPONSE_FORMAT_SHIFT) |
+		((cmd->data_present)<<ESDHC_DATA_PRESENT_SHIFT) |
+		((cmd->crc_check) << ESDHC_CRC_CHECK_SHIFT) |
+		((cmd->cmdindex_check) << ESDHC_CMD_INDEX_CHECK_SHIFT) |
+		((cmd->command) << ESDHC_CMD_INDEX_SHIFT) |
+		((cmd->block_count_enable_check) << \
+			ESDHC_BLOCK_COUNT_ENABLE_SHIFT) |
+		((cmd->multi_single_block) << \
+			ESDHC_MULTI_SINGLE_BLOCK_SELECT_SHIFT));
+
+	writel(u32Temp, esdhc_base_pointer + SDHCI_TRANSFER_MODE);
+}
+
+/*!
+ * Wait a END_CMD_RESP interrupt by interrupt status register.
+ * e-SDHC sets this bit after receving command response.
+ */
+static u32 esdhc_check_response(void)
+{
+	u32 status = 1;
+
+	/* Check whether the interrupt is an END_CMD_RESP
+	* or a response time out or a CRC error
+	*/
+	if ((readl(esdhc_base_pointer + SDHCI_INT_STATUS) & \
+		ESDHC_STATUS_END_CMD_RESP_MSK) &&
+		!(readl(esdhc_base_pointer + SDHCI_INT_STATUS) & \
+		ESDHC_STATUS_TIME_OUT_RESP_MSK) &&
+		!(readl(esdhc_base_pointer + SDHCI_INT_STATUS) & \
+		ESDHC_STATUS_RESP_CRC_ERR_MSK) &&
+		!(readl(esdhc_base_pointer + SDHCI_INT_STATUS) & \
+		ESDHC_STATUS_RESP_CMD_INDEX_ERR_MSK))
+		status = 0;
+
+	return status;
+}
+
+/*!
+ * This function will read response from e-SDHC
+ * register according to reponse format.
+ */
+void interface_read_response(esdhc_resp_t *cmd_resp)
+{
+	/* get response values from e-SDHC CMDRSP registers.*/
+	cmd_resp->cmd_rsp0 = (u32)readl(esdhc_base_pointer + SDHCI_RESPONSE);
+	cmd_resp->cmd_rsp1 = (u32)readl(esdhc_base_pointer + \
+							SDHCI_RESPONSE + 4);
+	cmd_resp->cmd_rsp2 = (u32)readl(esdhc_base_pointer + \
+							SDHCI_RESPONSE + 8);
+	cmd_resp->cmd_rsp3 = (u32)readl(esdhc_base_pointer + \
+							SDHCI_RESPONSE + 12);
+}
+
+/*!
+ * This function will read response from e-SDHC register
+ * according to reponse format.
+ */
+u32 interface_data_read(u32 *dest_ptr, u32 blk_len)
+{
+	u32 i = 0;
+	u32 j = 0;
+	u32 status = 1;
+	u32 *tmp_ptr = dest_ptr;
+
+	debug("Entry: interface_data_read()\n");
+
+	/* Enable Interrupt */
+	REG_WRITE_OR(ESDHC_INTERRUPT_ENABLE, \
+			esdhc_base_pointer + SDHCI_INT_ENABLE);
+
+	for (i = 0; i < (blk_len) / (ESDHC_FIFO_SIZE * 4); ++i) {
+		/* Wait for BRR bit to be set */
+		status = esdhc_wait_buf_rdy_intr(ESDHC_STATUS_BUF_READ_RDY_MSK,
+						 ESDHC_READ_DATA_TIME_OUT);
+
+		debug("esdhc_wait_buf_rdy_intr: %d\n", status);
+
+		if (!status) {
+			for (j = 0; j < ESDHC_FIFO_SIZE; ++j) {
+				*tmp_ptr++ = \
+				readl(esdhc_base_pointer + SDHCI_BUFFER);
+			}
+			if (!is_soc_rev(CHIP_REV_2_0)) {
+				/* Clear the BRR */
+				esdhc_clear_buf_rdy_intr(ESDHC_STATUS_BUF_READ_RDY_MSK);
+			}
+		} else {
+			debug("esdhc_wait_buf_rdy_intr failed\n");
+			break;
+		}
+	}
+
+	esdhc_wait_op_done_intr();
+
+	status = esdhc_check_data();
+
+	if (!is_soc_rev(CHIP_REV_2_0) && !status)
+		status = 0;
+
+	debug("esdhc_check_data: %d\n", status);
+	debug("Exit: interface_data_read()\n");
+
+	return status;
+}
+
 static void esdhc_set_ios(struct mmc *mmc)
 {
 	struct fsl_esdhc *regs = mmc->priv;
-
 	/* Set the clock speed */
 	set_sysctl(mmc, mmc->clock);
-
 	/* Set the bus width */
 	clrbits_be32(&regs->proctl, PROCTL_DTW_4 | PROCTL_DTW_8);
-
 	if (mmc->bus_width == 4)
 		setbits_be32(&regs->proctl, PROCTL_DTW_4);
 	else if (mmc->bus_width == 8)
 		setbits_be32(&regs->proctl, PROCTL_DTW_8);
 }
 
+/*!
+ * Wait a BUF_READ_READY  interrupt by pooling STATUS register.
+ */
+static u32 esdhc_wait_buf_rdy_intr(u32 mask, u32 multi_single_block)
+{
+	u32 status = 0;
+	u32 u32Retries = 0;
+
+	/* Wait interrupt (BUF_READ_RDY)
+	*/
+
+	for (u32Retries = RETRIES_TIMES; u32Retries > 0; --u32Retries) {
+		if (!(readl(esdhc_base_pointer + SDHCI_INT_STATUS) & mask)) {
+			status = 1;
+		} else {
+			status = 0;
+			break;
+		}
+		SDHC_DELAY_BY_100(10);
+	}
+
+	if (multi_single_block == MULTIPLE && \
+		readl(esdhc_base_pointer + SDHCI_INT_STATUS) & mask)
+		REG_WRITE_OR(mask, (esdhc_base_pointer + SDHCI_INT_STATUS));
+
+	return status;
+}
+
 static int esdhc_init(struct mmc *mmc)
 {
 	struct fsl_esdhc *regs = mmc->priv;
@@ -287,63 +718,170 @@ static int esdhc_init(struct mmc *mmc)
 
 	/* Enable cache snooping */
 	out_be32(&regs->scr, 0x00000040);
-
 	out_be32(&regs->sysctl, SYSCTL_HCKEN | SYSCTL_IPGEN);
-
 	/* Set the initial clock speed */
 	set_sysctl(mmc, 400000);
-
 	/* Disable the BRR and BWR bits in IRQSTAT */
 	clrbits_be32(&regs->irqstaten, IRQSTATEN_BRR | IRQSTATEN_BWR);
-
 	/* Put the PROCTL reg back to the default */
 	out_be32(&regs->proctl, PROCTL_INIT);
-
 	while (!(in_be32(&regs->prsstat) & PRSSTAT_CINS) && --timeout)
 		udelay(1000);
-
 	if (timeout <= 0)
 		return NO_CARD_ERR;
-
 	return 0;
 }
+/*!
+ * Clear BUF_READ_READY/BUF_WRITE_READY interrupt
+ * by writing 1 to STATUS register.
+ */
+static void esdhc_clear_buf_rdy_intr(u32 mask)
+{
+	writel(mask, (esdhc_base_pointer + SDHCI_INT_STATUS));
+}
+
+/*!
+ * Wait for TC, DEBE, DCE or DTOE by polling Interrupt STATUS register.
+ */
+static void esdhc_wait_op_done_intr(void)
+{
+	while (!(readl(esdhc_base_pointer + SDHCI_INT_STATUS) & \
+			ESDHC_STATUS_TRANSFER_COMPLETE_MSK))
+	;
+}
+
+/*!
+ * If READ_OP_DONE occured check ESDHC_STATUS_TIME_OUT_READ
+ * and RD_CRC_ERR_CODE and
+ * to determine if an error occured
+ */
+static u32 esdhc_check_data(void)
+{
+	u32 status = 1;
+
+	debug("Entry: esdhc_check_data()\n");
+
+	/* Check whether the interrupt is an OP_DONE
+	* or a data time out or a CRC error
+	*/
+	if ((readl(esdhc_base_pointer + SDHCI_INT_STATUS) & \
+		ESDHC_STATUS_TRANSFER_COMPLETE_MSK) &&
+		!(readl(esdhc_base_pointer + SDHCI_INT_STATUS) & \
+		ESDHC_STATUS_TIME_OUT_READ_MASK) &&
+		!(readl(esdhc_base_pointer + SDHCI_INT_STATUS) & \
+		ESDHC_STATUS_READ_CRC_ERR_MSK)) {
+		if (!is_soc_rev(CHIP_REV_2_0)) {
+			writel(ESDHC_STATUS_TRANSFER_COMPLETE_MSK, \
+				(esdhc_base_pointer + SDHCI_INT_STATUS));
+		}
+		status = 0;
+	} else {
+		status = 1;
+	}
+
+	debug("Exit: esdhc_check_data()\n");
+	return status;
+}
+
+/*!
+ * Check for Data timeout error, data CRC error and data end bit error
+ * to determine if an error occured.
+ */
+static u32 esdhc_check_data_crc_status(void)
+{
+	u32 status = 1;
+
+	/* Check whether the interrupt is DTOE/DCE/DEBE */
+	if (!(readl(esdhc_base_pointer + SDHCI_INT_STATUS) & \
+		ESDHC_STATUS_TIME_OUT_READ_MASK) &&
+		!(readl(esdhc_base_pointer + SDHCI_INT_STATUS) & \
+		ESDHC_STATUS_READ_CRC_ERR_MSK) &&
+		!(readl(esdhc_base_pointer + SDHCI_INT_STATUS) & \
+		ESDHC_STATUS_RW_DATA_END_BIT_ERR_MSK)) {
+		status = 0;
+	} else {
+		status = 1;
+	}
+
+	return status;
+}
 
 static int esdhc_initialize(bd_t *bis)
 {
 	struct fsl_esdhc *regs = (struct fsl_esdhc *)CONFIG_SYS_FSL_ESDHC_ADDR;
 	struct mmc *mmc;
 	u32 caps;
-
 	mmc = malloc(sizeof(struct mmc));
-
 	sprintf(mmc->name, "FSL_ESDHC");
 	mmc->priv = regs;
 	mmc->send_cmd = esdhc_send_cmd;
 	mmc->set_ios = esdhc_set_ios;
 	mmc->init = esdhc_init;
-
 	caps = regs->hostcapblt;
-
 	if (caps & ESDHC_HOSTCAPBLT_VS18)
 		mmc->voltages |= MMC_VDD_165_195;
 	if (caps & ESDHC_HOSTCAPBLT_VS30)
 		mmc->voltages |= MMC_VDD_29_30 | MMC_VDD_30_31;
 	if (caps & ESDHC_HOSTCAPBLT_VS33)
 		mmc->voltages |= MMC_VDD_32_33 | MMC_VDD_33_34;
-
 	mmc->host_caps = MMC_MODE_4BIT | MMC_MODE_8BIT;
-
 	if (caps & ESDHC_HOSTCAPBLT_HSS)
 		mmc->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS;
-
 	mmc->f_min = 400000;
 	mmc->f_max = MIN(gd->sdhc_clk, 50000000);
-
 	mmc_register(mmc);
-
 	return 0;
 }
 
+/*!
+ * Set Block length.
+ */
+void interface_config_block_info(u32 blk_len, u32 nob, u32 wml)
+{
+	/* Configre block Attributes register */
+	writel(((nob << ESDHC_BLOCK_SHIFT) | blk_len), \
+			(esdhc_base_pointer + SDHCI_BLOCK_SIZE));
+	/* Set Read Water MArk Level register */
+	writel(wml, esdhc_base_pointer + SDHCI_WML_LEV);
+}
+
+/*!
+ * This function will write data to device  attached to interface.
+ */
+u32 interface_data_write(u32 *dest_ptr, u32 blk_len)
+{
+	u32 i = 0;
+	u32 j = 0;
+	u32 status = 1;
+	u32 *tmp_ptr = dest_ptr;
+
+	debug("Entry: interface_data_write()\n");
+
+	/* Enable Interrupt */
+	REG_WRITE_OR(ESDHC_INTERRUPT_ENABLE, \
+			(esdhc_base_pointer + SDHCI_INT_ENABLE));
+
+	for (i = 0; i < (blk_len) / (ESDHC_FIFO_SIZE * 4); ++i) {
+		/* Wait for BWR bit to be set */
+		esdhc_wait_buf_rdy_intr(ESDHC_STATUS_BUF_WRITE_RDY_MSK, \
+						SINGLE);
+		for (j = 0; j < ESDHC_FIFO_SIZE; ++j) {
+			writel((*tmp_ptr), esdhc_base_pointer + SDHCI_BUFFER);
+			++tmp_ptr;
+		}
+		esdhc_clear_buf_rdy_intr(ESDHC_STATUS_BUF_WRITE_RDY_MSK);
+	}
+
+	/* Wait for transfer complete operation interrupt */
+	esdhc_wait_op_done_intr();
+
+	/* Check for status errors */
+	status = esdhc_check_data();
+
+	debug("Exit: interface_data_write()\n");
+	return status;
+}
+
 int fsl_esdhc_mmc_init(bd_t *bis)
 {
 	return esdhc_initialize(bis);
@@ -353,15 +891,48 @@ void fdt_fixup_esdhc(void *blob, bd_t *bd)
 {
 	const char *compat = "fsl,esdhc";
 	const char *status = "okay";
-
 	if (!hwconfig("esdhc")) {
 		status = "disabled";
 		goto out;
 	}
-
 	do_fixup_by_compat_u32(blob, compat, "clock-frequency",
 			       gd->sdhc_clk, 1);
 out:
 	do_fixup_by_compat(blob, compat, "status", status,
 			   strlen(status) + 1, 1);
 }
+
+/*!
+ * Configure the CMD line PAD configuration for strong or weak pull-up.
+ */
+/*
+void esdhc_set_cmd_pullup(esdhc_pullup_t pull_up)
+{
+	u32 interface_esdhc = 0;
+	u32 pad_val = 0;
+
+	interface_esdhc = (readl(0x53ff080c)) & (0x000000C0) >> 6;
+
+	if (pull_up == STRONG) {
+		pad_val = PAD_CTL_PUE_PUD | PAD_CTL_PKE_ENABLE |
+			PAD_CTL_HYS_SCHMITZ | PAD_CTL_DRV_HIGH |
+			PAD_CTL_22K_PU | PAD_CTL_SRE_FAST;
+	} else {
+		pad_val = PAD_CTL_PUE_PUD | PAD_CTL_PKE_ENABLE |
+			PAD_CTL_HYS_SCHMITZ | PAD_CTL_DRV_MAX |
+			PAD_CTL_100K_PU | PAD_CTL_SRE_FAST;
+	}
+
+	switch (interface_esdhc) {
+	case ESDHC1:
+		mxc_iomux_set_pad(MX51_PIN_SD1_CMD, pad_val);
+		break;
+	case ESDHC2:
+		mxc_iomux_set_pad(MX51_PIN_SD2_CMD, pad_val);
+		break;
+	case ESDHC3:
+	default:
+		break;
+	}
+}
+*/
diff --git a/drivers/mmc/fsl_mmc.c b/drivers/mmc/fsl_mmc.c
new file mode 100644
index 0000000..2fbf4d6
--- /dev/null
+++ b/drivers/mmc/fsl_mmc.c
@@ -0,0 +1,1565 @@
+/*
+ * (C) Copyright 2008-2009 Freescale Semiconductor, Inc.
+ *
+ * See file CREDITS for	list of people who contributed to this
+ * project.
+ *
+ * This	program	is free	software; you can redistribute it and/or
+ * modify it under the terms of	the GNU General Public License as
+ * published by	the Free Software Foundation; either version 2 of
+ * the License,	or (at your option) any later version.
+ *
+ * This	program	is distributed in the hope that	it will	be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59	Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <config.h>
+#include <common.h>
+#ifdef CONFIG_MMC
+#include <linux/mmc/mmc.h>
+#include <linux/mmc/sd.h>
+#include <linux/mmc/core.h>
+#include <linux/mmc/card.h>
+#include <asm/errno.h>
+#include <part.h>
+#include <asm/arch/sdhc.h>
+#include <linux/types.h>
+
+#define CARD_SUPPORT_BYTE_MODE			(0)
+#define CARD_SUPPORT_SECT_MODE			(1)
+
+#define RETRY_TIMEOUT					(10)
+
+
+extern int fat_register_device(block_dev_desc_t *dev_desc, int part_no);
+
+static block_dev_desc_t	mmc_dev;
+
+block_dev_desc_t *mmc_get_dev(int dev)
+{
+	return (block_dev_desc_t *)&mmc_dev;
+}
+
+/*
+ * FIXME needs to read cid and csd info	to determine block size
+ * and other parameters
+ */
+static int mmc_ready;
+static u32 g_Card_Address_Mode;
+static u32 g_Card_rca;
+
+enum states {
+    IDLE,
+    READY,
+    IDENT,
+    STBY,
+    TRAN,
+    DATA,
+    RCV,
+    PRG,
+    DIS,
+    BTST,
+    SLP
+};
+
+static u32 mmc_cmd(struct mmc_command *cmd, u32 opcode,
+		u32 arg, u32 xfer, u32 fmt, u32 write,
+		u32 crc, u32 cmd_check_en);
+static u32 mmc_acmd(struct mmc_command *cmd, u32 opcode,
+		u32 arg, u32 xfer, u32 fmt, u32 write,
+		u32 crc, u32 cmd_check_en);
+static s32 mmc_decode_cid(struct mmc_card *card);
+static s32 mmc_decode_csd(struct mmc_card *card);
+static s32 sd_voltage_validation(void);
+static s32 mmc_voltage_validation(void);
+static s32 mmc_send_cid(struct mmc_card *card);
+static s32 mmc_send_csd(struct mmc_card *card, u32 u32CardRCA);
+static s32 mmc_select_card(u32 card_rca);
+static s32 mmcsd_check_status(u32 card_rca, u32 timeout,
+		u32 card_state, u32 status_bit);
+static s32 mmc_send_relative_addr(u32 *u32CardRCA);
+static s32 mmc_decode_scr(struct mmc_card *card);
+static s32 mmc_send_scr(struct mmc_card *card);
+static s32 mmc_set_relative_addr(u32 u32CardRCA);
+static s32 mmc_app_set_bus_width(s32 width);
+static s32 mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value);
+static s32 mmc_sd_switch(struct mmc_card *card, s32 mode, s32 group,
+						u8 value, u8 *resp);
+
+static u32 mmc_cmd(struct mmc_command *cmd, u32 opcode,
+			u32 arg, u32 xfer, u32 fmt,
+			u32 write, u32 crc, u32 cmd_check_en)
+{
+	struct mmc_command *pCmd = cmd;
+
+	pCmd->cmd.command = opcode;
+	pCmd->cmd.arg =	arg;
+	pCmd->cmd.data_transfer	= xfer;
+	pCmd->cmd.response_format = pCmd->resp.format = fmt;
+	pCmd->cmd.data_present = write;
+	pCmd->cmd.crc_check = crc;
+	pCmd->cmd.cmdindex_check = cmd_check_en;
+
+	if (MMC_READ_MULTIPLE_BLOCK == opcode || \
+		MMC_WRITE_MULTIPLE_BLOCK == opcode) {
+		pCmd->cmd.block_count_enable_check = ENABLE;
+		pCmd->cmd.multi_single_block = MULTIPLE;
+	} else {
+		pCmd->cmd.block_count_enable_check = DISABLE;
+		pCmd->cmd.multi_single_block = SINGLE;
+	}
+
+	if (interface_send_cmd_wait_resp(&(pCmd->cmd))) {
+		debug("interface_send_cmd_wait_resp Failed!");
+		return EPERM;
+	}
+
+	interface_read_response(&(pCmd->resp));
+
+	return 0;
+}
+
+static u32 mmc_acmd(struct mmc_command *cmd, u32 opcode,
+			u32 arg, u32 xfer, u32 fmt, u32 write,
+			u32 crc, u32 cmd_check_en)
+{
+	struct mmc_command *pCmd = cmd;
+	struct mmc_command stAPCmd;
+
+	memset(&stAPCmd, 0, sizeof(struct mmc_command));
+
+	/* Send MMC_APP_CMD first to use ACMD */
+	stAPCmd.cmd.command = MMC_APP_CMD;
+	stAPCmd.cmd.arg = (g_Card_rca << 16);
+	stAPCmd.cmd.data_transfer = READ;
+	stAPCmd.cmd.response_format = stAPCmd.resp.format = RESPONSE_48;
+	stAPCmd.cmd.data_present = DATA_PRESENT_NONE;
+	stAPCmd.cmd.crc_check = ENABLE;
+	stAPCmd.cmd.cmdindex_check = ENABLE;
+
+	if (interface_send_cmd_wait_resp(&(stAPCmd.cmd))) {
+		debug("Send MMC_APP_CMD Failed! :(");
+		return EPERM;
+	}
+
+	pCmd->cmd.command = opcode;
+	pCmd->cmd.arg =	arg;
+	pCmd->cmd.data_transfer	= xfer;
+	pCmd->cmd.response_format = pCmd->resp.format = fmt;
+	pCmd->cmd.data_present = write;
+	pCmd->cmd.crc_check = crc;
+	pCmd->cmd.cmdindex_check = cmd_check_en;
+
+	if (interface_send_cmd_wait_resp(&(pCmd->cmd))) {
+		debug("interface_send_cmd_wait_resp Failed!, :(");
+		return EPERM;
+	}
+
+	interface_read_response(&(pCmd->resp));
+
+	return 0;
+}
+
+int
+/****************************************************/
+mmc_read(ulong src, uchar *dst, int size)
+/****************************************************/
+{
+	struct mmc_command stCmd;
+	u32 u32Offset = src;
+	u32 *pu32Dst = (u32 *)dst;
+	s32 s32Rslt = EPERM;
+	s32 s32ReadRslt	= 0;
+	u32 u32BlkLen = BLK_LEN;
+	u32 u32MultiBlkNum = 0;
+
+	if (!mmc_ready)	{
+		printf("Please initial the Card first\n");
+		return EPERM;
+	}
+
+	if (size == 0)
+		return 0;
+
+	debug("Entry: mmc_read");
+
+	debug("src:%08x	dst:%08x size:%d", src,	dst, size);
+
+	memset(&stCmd, 0, sizeof(struct	mmc_command));
+
+	if (g_Card_Address_Mode	== CARD_SUPPORT_SECT_MODE) {
+		u32BlkLen = 1;
+		u32Offset /= BLK_LEN;
+	}
+
+	u32MultiBlkNum = (size % BLK_LEN) ? ((size / BLK_LEN) + 1) \
+					 : (size / BLK_LEN);
+
+	if (mmcsd_check_status(g_Card_rca, 96, TRAN, R1_ERROR)) {
+		debug("Can't wait for TRAN state! :(\n");
+		return EPERM;
+	}
+
+	interface_config_block_info(BLK_LEN, u32MultiBlkNum, \
+				(u32)0x00000080);
+
+	s32Rslt	= mmc_cmd(&stCmd,
+			((u32MultiBlkNum > 1) ? MMC_READ_MULTIPLE_BLOCK : MMC_READ_SINGLE_BLOCK),
+			u32Offset,
+			READ,
+			RESPONSE_48,
+			DATA_PRESENT,
+			ENABLE,
+			ENABLE);
+
+	if (s32Rslt) {
+		debug("Send MMC_READ_MULTIPLE_BLOCK Failed! :(\n");
+		return EPERM;
+	}
+
+	s32Rslt	= interface_data_read((u32 *)pu32Dst, BLK_LEN * u32MultiBlkNum);
+
+	if (s32Rslt) {
+		debug("interface_data_read Failed! :(\n");
+		return EPERM;
+	}
+
+	if (u32MultiBlkNum > 1) {
+		s32Rslt	= mmc_cmd(&stCmd,
+				MMC_STOP_TRANSMISSION,
+				0,
+				READ,
+				RESPONSE_48,
+				DATA_PRESENT_NONE,
+				ENABLE,
+				ENABLE);
+
+		if (s32Rslt) {
+			debug("Send MMC_STOP_TRANSMISSION Failed! :(\n");
+			return EPERM;
+		}
+	}
+
+	debug("mmc_read	succeed! :)");
+
+	debug("Exit: mmc_read");
+
+	return s32ReadRslt;
+}
+
+int
+/****************************************************/
+mmc_write(uchar *src, ulong dst, int size)
+/****************************************************/
+{
+	struct mmc_command stCmd;
+	u32 u32Offset = dst;
+	s32 s32Rslt = EPERM;
+	s32 s32WriteRslt = 0;
+	u32 u32BlkLen = BLK_LEN;
+	u32 *pu32Src = (u32 *)src;
+	u32 u32MultiBlkNum = 0;
+
+	debug("Entry: mmc_write");
+
+	debug("src:%08x	dst:%08x size:%d", src,	dst, size);
+
+	if (!mmc_ready)	{
+		printf("Please initial the Card first\n");
+		return -1;
+	}
+
+	if (size == 0)
+		return 0;
+
+	memset(&stCmd, 0, sizeof(struct	mmc_command));
+
+	if (g_Card_Address_Mode	== CARD_SUPPORT_SECT_MODE) {
+		u32BlkLen = 1;
+		u32Offset /= BLK_LEN;
+	}
+
+	u32MultiBlkNum = (size % BLK_LEN) ? ((size / BLK_LEN) + 1) \
+					 : (size / BLK_LEN);
+
+	if (mmcsd_check_status(g_Card_rca, 96, TRAN, R1_ERROR)) {
+		debug("Can't wait for TRAN state! :(\n");
+		return EPERM;
+	}
+
+	interface_config_block_info(BLK_LEN, u32MultiBlkNum, \
+					(u32)0x00800000);
+
+	s32Rslt	= mmc_cmd(&stCmd,
+			((u32MultiBlkNum > 1) ? MMC_WRITE_MULTIPLE_BLOCK : MMC_WRITE_BLOCK),
+			u32Offset,
+			WRITE,
+			RESPONSE_48,
+			DATA_PRESENT,
+			ENABLE,
+			ENABLE);
+
+	if (s32Rslt) {
+		debug("Send MMC_WRITE_BLOCK Failed! :(");
+		return EPERM;
+	}
+
+	s32Rslt	= interface_data_write((u32 *)pu32Src,
+					BLK_LEN * u32MultiBlkNum);
+
+	if (s32Rslt) {
+		debug("interface_data_read Failed! :(");
+		return EPERM;
+	}
+
+	if (u32MultiBlkNum > 1) {
+		s32Rslt	= mmc_cmd(&stCmd,
+				MMC_STOP_TRANSMISSION,
+				0,
+				READ,
+				RESPONSE_48,
+				DATA_PRESENT_NONE,
+				ENABLE,
+				ENABLE);
+
+		if (s32Rslt) {
+			debug("Send MMC_STOP_TRANSMISSION Failed! :(");
+			return EPERM;
+		}
+	}
+
+	debug("mmc_write succeed! :)");
+
+	debug("Exit: mmc_write");
+
+	return s32WriteRslt;
+}
+
+ulong
+/****************************************************/
+mmc_bread(int dev, ulong blknr, lbaint_t blkcnt, void *dst)
+/****************************************************/
+{
+	int mmc_block_size = BLK_LEN;
+	ulong src = blknr * mmc_block_size + CONFIG_MMC_BASE;
+
+	if (mmc_read(src, (uchar *)dst, blkcnt * mmc_block_size))
+		return 0;
+	else
+		return blkcnt;
+}
+
+ulong
+/****************************************************/
+mmc_bwrite(int dev, ulong blknr, lbaint_t blkcnt, const void *src)
+/****************************************************/
+{
+	int mmc_block_size = BLK_LEN;
+	ulong dst = blknr * mmc_block_size + CONFIG_MMC_BASE;
+
+	if (mmc_write((uchar *)src, dst, blkcnt * mmc_block_size))
+		return 0;
+	else
+		return blkcnt;
+}
+
+#define	UNSTUFF_BITS(resp, start, size)					\
+	({								\
+		const int __size = size;				\
+		const uint32_t __mask =	(__size	< 32 ? 1 << __size : 0) - 1; \
+		const int32_t __off = 3 - ((start) / 32); \
+		const int32_t __shft = (start) & 31; \
+		uint32_t __res;						\
+									\
+		__res =	resp[__off] >> __shft;				\
+		if (__size + __shft > 32)				\
+			__res |= resp[__off-1] << ((32 - __shft) % 32);	\
+		__res &	__mask;						\
+	})
+
+static const unsigned int tran_exp[] = {
+	10000, 100000, 1000000, 10000000,
+	0, 0, 0, 0
+};
+
+static const unsigned char tran_mant[] = {
+	0,  10, 12, 13, 15, 20, 25, 30,
+	35, 40, 45, 50, 55, 60, 70, 80,
+};
+
+static const unsigned int tacc_exp[] = {
+	1, 10, 100, 1000, 10000, 100000, 1000000, 10000000,
+};
+
+static const unsigned int tacc_mant[] = {
+	0,  10, 12, 13, 15, 20, 25, 30,
+	35, 40, 45, 50, 55, 60, 70, 80,
+};
+
+static s32 mmc_set_blk_len(u32 len)
+{
+	s32 s32Rslt = 0;
+	struct mmc_command stCmd;
+
+	debug("Entry: mmc_set_blk_len");
+
+	memset(&stCmd, 0, sizeof(struct mmc_command));
+
+	s32Rslt	= mmc_cmd(&stCmd,
+			MMC_SET_BLOCKLEN,
+			BLK_LEN,
+			READ,
+			RESPONSE_48,
+			DATA_PRESENT_NONE,
+			ENABLE,
+			ENABLE);
+
+	if (s32Rslt) {
+		debug("Send MMC_SET_BLOCKLEN Failed! :(");
+		return EPERM;
+	}
+
+	debug("Exit: mmc_set_blk_len");
+
+	return s32Rslt;
+}
+
+/*
+ * Given the decoded CSD structure, decode the raw CID to our CID structure.
+ */
+static s32 mmc_decode_cid(struct mmc_card *card)
+{
+	u32 *resp = card->raw_cid;
+
+	debug("Entry: mmc_decode_cid");
+
+	if (!card) {
+		debug("NULL card pointer!");
+		return EPERM;
+	}
+
+	memset(&card->cid, 0, sizeof(struct mmc_cid));
+
+	switch (card->type) {
+	case MMC_TYPE_MMC:
+		debug("MMC Card!");
+		/*
+		* The selection	of the format here is based upon published
+		* specs	from sandisk and from what people have reported.
+		*/
+		switch (card->csd.mmca_vsn) {
+		case 0:	/* MMC v1.0 - v1.2 */
+		case 1:	/* MMC v1.4	*/
+			card->cid.manfid	= \
+				UNSTUFF_BITS(resp, 104, 24);
+			card->cid.prod_name[0]	= \
+				UNSTUFF_BITS(resp, 96, 8);
+			card->cid.prod_name[1]	= \
+				UNSTUFF_BITS(resp, 88, 8);
+			card->cid.prod_name[2]	= \
+				UNSTUFF_BITS(resp, 80, 8);
+			card->cid.prod_name[3]	= \
+				UNSTUFF_BITS(resp, 72, 8);
+			card->cid.prod_name[4]	= \
+				UNSTUFF_BITS(resp, 64, 8);
+			card->cid.prod_name[5]	= \
+				UNSTUFF_BITS(resp, 56, 8);
+			card->cid.prod_name[6]	= \
+				UNSTUFF_BITS(resp, 48, 8);
+			card->cid.hwrev	= UNSTUFF_BITS(resp, 44, 4);
+			card->cid.fwrev	= UNSTUFF_BITS(resp, 40, 4);
+			card->cid.serial = UNSTUFF_BITS(resp, 16, 24);
+			card->cid.month	= UNSTUFF_BITS(resp, 12, 4);
+			card->cid.year	= \
+				UNSTUFF_BITS(resp, 8,	4) + 1997;
+
+			sprintf((char *)mmc_dev.vendor,
+				"Man %08x \"%c%c%c%c%c%c%c\" Date %02u/%04u",
+				card->cid.manfid,
+				card->cid.prod_name[0],
+				card->cid.prod_name[1],
+				card->cid.prod_name[2],
+				card->cid.prod_name[3],
+				card->cid.prod_name[4],
+				card->cid.prod_name[5],
+				card->cid.prod_name[6],
+				card->cid.month,
+				card->cid.year);
+			sprintf((char *)mmc_dev.revision, "%d.%d",
+					card->cid.hwrev,
+					card->cid.fwrev);
+			sprintf((char *)mmc_dev.product, "%u",
+					card->cid.serial);
+			break;
+		case 2:	/* MMC v2.0 - v2.2 */
+		case 3:	/* MMC v3.1 - v3.3 */
+		case 4:	/* MMC v4 */
+			card->cid.manfid = UNSTUFF_BITS(resp, 120, 8);
+			card->cid.oemid.mmc_id	= \
+				UNSTUFF_BITS(resp, 104, 16);
+			card->cid.prod_name[0]	= \
+				UNSTUFF_BITS(resp, 96, 8);
+			card->cid.prod_name[1]	= \
+				UNSTUFF_BITS(resp, 88, 8);
+			card->cid.prod_name[2]	= \
+				UNSTUFF_BITS(resp, 80, 8);
+			card->cid.prod_name[3]	= \
+				UNSTUFF_BITS(resp, 72, 8);
+			card->cid.prod_name[4]	= \
+				UNSTUFF_BITS(resp, 64, 8);
+			card->cid.prod_name[5]	= \
+				UNSTUFF_BITS(resp, 56, 8);
+			card->cid.serial = UNSTUFF_BITS(resp, 16, 32);
+			card->cid.month	 = UNSTUFF_BITS(resp, 12, 4);
+			card->cid.year	 = \
+				UNSTUFF_BITS(resp, 8, 4) + 1997;
+
+			sprintf((char *)mmc_dev.vendor,
+			"Man %02x OEM %04x \"%c%c%c%c%c%c\" Date %02u/%04u",
+				card->cid.manfid,
+				card->cid.oemid.mmc_id,
+				card->cid.prod_name[0],
+				card->cid.prod_name[1],
+				card->cid.prod_name[2],
+				card->cid.prod_name[3],
+				card->cid.prod_name[4],
+				card->cid.prod_name[5],
+				card->cid.month,
+				card->cid.year);
+			sprintf((char *)mmc_dev.product, "%u",
+					card->cid.serial);
+			sprintf((char *)mmc_dev.revision, "N/A");
+			break;
+		default:
+			printf("MMC card has unknown MMCA version %d\n",
+				card->csd.mmca_vsn);
+			return EPERM;
+		}
+		break;
+
+	case MMC_TYPE_SD:
+		debug("SD Card!");
+		card->cid.manfid	= UNSTUFF_BITS(resp, 120, 8);
+		card->cid.oemid.sd_id[0] = UNSTUFF_BITS(resp, 112, 8);
+		card->cid.oemid.sd_id[1] = UNSTUFF_BITS(resp, 104, 8);
+		card->cid.prod_name[0]	= UNSTUFF_BITS(resp, 96, 8);
+		card->cid.prod_name[1]	= UNSTUFF_BITS(resp, 88, 8);
+		card->cid.prod_name[2]	= UNSTUFF_BITS(resp, 80, 8);
+		card->cid.prod_name[3]	= UNSTUFF_BITS(resp, 72, 8);
+		card->cid.prod_name[4]	= UNSTUFF_BITS(resp, 64, 8);
+		card->cid.hwrev		= UNSTUFF_BITS(resp, 60, 4);
+		card->cid.fwrev		= UNSTUFF_BITS(resp, 56, 4);
+		card->cid.serial	= UNSTUFF_BITS(resp, 24, 32);
+		card->cid.year		= UNSTUFF_BITS(resp, 12, 8);
+		card->cid.month		= UNSTUFF_BITS(resp, 8,	4);
+		card->cid.year += 2000;	/* SD cards year offset */
+
+		sprintf((char *)mmc_dev.vendor,
+			"Man %02x OEM %c%c \"%c%c%c%c%c\" Date %02u/%04u",
+			card->cid.manfid,
+			card->cid.oemid.sd_id[0],
+			card->cid.oemid.sd_id[1],
+			card->cid.prod_name[0],
+			card->cid.prod_name[1],
+			card->cid.prod_name[2],
+			card->cid.prod_name[3],
+			card->cid.prod_name[4],
+			card->cid.month,
+			card->cid.year);
+		sprintf((char *)mmc_dev.revision, "%d.%d",
+				card->cid.hwrev, card->cid.fwrev);
+		sprintf((char *)mmc_dev.product, "%u",
+				card->cid.serial);
+		break;
+
+	default:
+		printf("unknown card type!");
+		return EPERM;
+	}
+
+	printf("%s card.\nVendor: %s\nProduct: %s\nRevision: %s\n",
+	       (IF_TYPE_SD == mmc_dev.if_type) ? "SD" : "MMC", mmc_dev.vendor,
+	       mmc_dev.product, mmc_dev.revision);
+
+	debug("Exit: mmc_decode_cid");
+
+	return 0;
+}
+
+/*
+ * Given a 128-bit response, decode to our card CSD structure.
+ */
+static s32 mmc_decode_csd(struct mmc_card *card)
+{
+	struct mmc_csd *csd = &card->csd;
+	u32 e, m, csd_struct;
+	u32 *resp = card->raw_csd;
+
+	debug("Entry: mmc_decode_csd");
+
+	if (!card) {
+		debug("NULL card pointer!");
+		return EPERM;
+	}
+
+	switch (card->type) {
+	case MMC_TYPE_MMC:
+		/*
+		 * We only understand CSD structure v1.1 and v1.2.
+		 * v1.2	has extra information in bits 15, 11 and 10.
+		 */
+		csd_struct = UNSTUFF_BITS(resp,	126, 2);
+		if (csd_struct != 1 && csd_struct != 2)	{
+			printf("unrecognised CSD structure version %d\n",
+				csd_struct);
+			return EPERM;
+		}
+
+		csd->mmca_vsn	 = UNSTUFF_BITS(resp, 122, 4);
+		m = UNSTUFF_BITS(resp, 115, 4);
+		e = UNSTUFF_BITS(resp, 112, 3);
+		csd->tacc_ns   = (tacc_exp[e] * tacc_mant[m] + 9) / 10;
+		csd->tacc_clks = UNSTUFF_BITS(resp, 104, 8) * 100;
+
+		m = UNSTUFF_BITS(resp, 99, 4);
+		e = UNSTUFF_BITS(resp, 96, 3);
+		csd->max_dtr  = tran_exp[e] * tran_mant[m];
+		csd->cmdclass = UNSTUFF_BITS(resp, 84, 12);
+
+		e =	UNSTUFF_BITS(resp, 47, 3);
+		m =	UNSTUFF_BITS(resp, 62, 12);
+		csd->capacity = (1 + m) << (e + 2);
+
+		csd->read_blkbits = UNSTUFF_BITS(resp, 80, 4);
+		csd->read_partial = UNSTUFF_BITS(resp, 79, 1);
+		csd->write_misalign = UNSTUFF_BITS(resp, 78, 1);
+		csd->read_misalign = UNSTUFF_BITS(resp, 77, 1);
+		csd->r2w_factor	= UNSTUFF_BITS(resp, 26, 3);
+		csd->write_blkbits = UNSTUFF_BITS(resp,	22, 4);
+		csd->write_partial = UNSTUFF_BITS(resp,	21, 1);
+
+		mmc_dev.if_type = IF_TYPE_MMC;
+
+		mmc_dev.lba = csd->capacity;
+		mmc_dev.blksz = 1 << csd->read_blkbits;
+		mmc_dev.part_type = PART_TYPE_DOS;
+		mmc_dev.dev = 0;
+		mmc_dev.lun = 0;
+		mmc_dev.type = DEV_TYPE_HARDDISK;
+		mmc_dev.removable = 0;
+		mmc_dev.block_read  = mmc_bread;
+		mmc_dev.block_write = mmc_bwrite;
+
+		break;
+
+	case MMC_TYPE_SD:
+		csd_struct = UNSTUFF_BITS(resp,	126, 2);
+
+		switch (csd_struct) {
+		case 0:
+			m = UNSTUFF_BITS(resp, 115, 4);
+			e = UNSTUFF_BITS(resp, 112, 3);
+			csd->tacc_ns = (tacc_exp[e] * tacc_mant[m] + 9)	/ 10;
+			csd->tacc_clks = UNSTUFF_BITS(resp, 104, 8) * 100;
+
+			m = UNSTUFF_BITS(resp, 99, 4);
+			e = UNSTUFF_BITS(resp, 96, 3);
+			csd->max_dtr = tran_exp[e] * tran_mant[m];
+			csd->cmdclass = UNSTUFF_BITS(resp, 84, 12);
+
+			e = UNSTUFF_BITS(resp, 47, 3);
+			m = UNSTUFF_BITS(resp, 62, 12);
+			csd->capacity = (1 + m) << (e + 2);
+
+			csd->read_blkbits = UNSTUFF_BITS(resp, 80, 4);
+			csd->read_partial = UNSTUFF_BITS(resp, 79, 1);
+			csd->write_misalign = UNSTUFF_BITS(resp, 78, 1);
+			csd->read_misalign = UNSTUFF_BITS(resp,	77, 1);
+			csd->r2w_factor	= UNSTUFF_BITS(resp, 26, 3);
+			csd->write_blkbits = UNSTUFF_BITS(resp, 22, 4);
+			csd->write_partial = UNSTUFF_BITS(resp,	21, 1);
+
+			mmc_dev.if_type = IF_TYPE_SD;
+
+			mmc_dev.lba = csd->capacity;
+			mmc_dev.blksz = 1 << csd->read_blkbits;
+			mmc_dev.part_type = PART_TYPE_DOS;
+			mmc_dev.dev = 0;
+			mmc_dev.lun = 0;
+			mmc_dev.type = DEV_TYPE_HARDDISK;
+			mmc_dev.removable = 0;
+			mmc_dev.block_read  = mmc_bread;
+			mmc_dev.block_write = mmc_bwrite;
+
+			break;
+		case 1:
+			/*
+			 * This	is a block-addressed SDHC card.	Most
+			 * interesting fields are unused and have fixed
+			 * values. To avoid getting tripped by buggy cards,
+			 * we assume those fixed values	ourselves.
+			 */
+			mmc_card_set_blockaddr(card);
+
+			csd->tacc_ns   = 0; /* Unused */
+			csd->tacc_clks = 0; /* Unused */
+
+			m = UNSTUFF_BITS(resp, 99, 4);
+			e = UNSTUFF_BITS(resp, 96, 3);
+			csd->max_dtr  = tran_exp[e] * tran_mant[m];
+			csd->cmdclass = UNSTUFF_BITS(resp, 84, 12);
+
+			m = UNSTUFF_BITS(resp, 48, 22);
+			csd->capacity = (1 + m) << 10;
+
+			csd->read_blkbits = 9;
+			csd->read_partial = 0;
+			csd->write_misalign = 0;
+			csd->read_misalign = 0;
+			csd->r2w_factor	= 4; /*	Unused */
+			csd->write_blkbits = 9;
+			csd->write_partial = 0;
+
+			mmc_dev.if_type = IF_TYPE_SD;
+
+			mmc_dev.lba = csd->capacity;
+			mmc_dev.blksz = 512;
+			mmc_dev.part_type = PART_TYPE_DOS;
+			mmc_dev.dev = 0;
+			mmc_dev.lun = 0;
+			mmc_dev.type = DEV_TYPE_HARDDISK;
+			mmc_dev.removable = 0;
+			mmc_dev.block_read = mmc_bread;
+
+			break;
+		default:
+			printf("unrecognised CSD structure version %d\n",
+					csd_struct);
+			return EPERM;
+		}
+		break;
+
+	default:
+		printf("unknown	card type!");
+		return EPERM;
+		}
+
+	debug("Exit: mmc_decode_csd");
+
+	return 0;
+}
+
+/*
+ * Do SD voltage validation.
+ */
+static s32 sd_voltage_validation(void)
+{
+	struct mmc_command stCmd;
+	u32 u32OcrVal =	0;
+	u32 u32VoltageValidation = EPERM;
+	s32 s32Rslt	= EPERM;
+	s32 s32Retries = 0;
+	/* Supported arguments for CMD8 */
+	const u32 sd_if_cmd_arg[SD_IF_CMD_ARG_COUNT] = {
+		SD_IF_HV_COND_ARG,
+		SD_IF_LV_COND_ARG };
+	const u32 sd_ocr_value[SD_OCR_VALUE_COUNT] = {
+		SD_OCR_VALUE_HV_HC,
+		SD_OCR_VALUE_LV_HC,
+		SD_OCR_VALUE_HV_LC };
+
+	debug("Entry: sd_voltage_validation");
+
+	memset(&stCmd, 0, sizeof(struct	mmc_command));
+
+	for (s32Retries = 0; s32Retries < SD_IF_CMD_ARG_COUNT; ++s32Retries) {
+		/* Configure CMD55 for SD card */
+		/* This	command	expects	defualt	RCA 0x0000 as argument.*/
+		s32Rslt	= mmc_cmd(&stCmd,
+				SD_SEND_IF_COND,
+				sd_if_cmd_arg[s32Retries],
+				READ,
+				RESPONSE_48,
+				DATA_PRESENT_NONE,
+				ENABLE,
+				ENABLE);
+
+		if (!s32Rslt) {
+			if (sd_if_cmd_arg[s32Retries] == \
+			(stCmd.resp.cmd_rsp0 & sd_if_cmd_arg[s32Retries])) {
+				u32OcrVal = sd_ocr_value[s32Retries];
+			} else {
+				u32OcrVal = 0;
+			}
+			break;
+		}
+	}
+
+	if (s32Rslt) {
+		debug("Card is of SD-1.x spec with LC");
+		u32OcrVal = SD_OCR_VALUE_HV_LC;
+	}
+
+	for (s32Retries = RETRY_TIMEOUT; s32Retries; --s32Retries) {
+		/* Configure ACMD41	for	SD card	*/
+		/* This	command	expects	operating voltage range	as argument.*/
+		s32Rslt	= mmc_acmd(&stCmd,
+				SD_APP_OP_COND,
+				u32OcrVal,
+				READ,
+				RESPONSE_48,
+				DATA_PRESENT_NONE,
+				DISABLE,
+				DISABLE);
+
+		/* Issue ACMD41	to SD Memory card to determine OCR value */
+		if (s32Rslt == EPERM) {
+			debug("Send SD_APP_OP_COND Failed! :(");
+			break;
+		}
+
+		/* Obtain OCR value	from the response buffer
+		*/
+		u32OcrVal = stCmd.resp.cmd_rsp0;
+
+		/* Check if	card busy bit is cleared or	not	*/
+		if (!(u32OcrVal	& MMC_CARD_BUSY))
+			continue;
+
+		u32VoltageValidation = 0;
+
+		/* Check if volatge	lies in	range or not*/
+		g_Card_Address_Mode = (u32OcrVal & 0x40000000) ? \
+			 CARD_SUPPORT_SECT_MODE : CARD_SUPPORT_BYTE_MODE;
+		break;
+	}
+
+	debug("Exit: sd_voltage_validation");
+
+	return u32VoltageValidation;
+}
+
+/*
+ * Do SD voltage validation.
+ */
+static s32 mmc_voltage_validation(void)
+{
+	struct mmc_command stCmd;
+	u32 u32Respones	= 0;
+	u32 u32VoltageValidation = EPERM;
+	s32 s32Rslt = EPERM;
+	s32 s32Retries = 0;
+
+	debug("Entry: mmc_voltage_validation");
+
+	for (s32Retries = RETRY_TIMEOUT; s32Retries; --s32Retries) {
+		s32Rslt	= mmc_cmd(&stCmd,
+				MMC_SEND_OP_COND,
+				(u32)0x40FF8000,
+				READ,
+				RESPONSE_48,
+				DATA_PRESENT_NONE,
+				DISABLE,
+				DISABLE);
+
+		/* Issue CMD55 to SD Memory card*/
+		if (s32Rslt == EPERM) {
+			debug("Send MMC_SEND_OP_COND Failed! :(");
+			break;
+		}
+
+		/* Obtain OCR value from the response buffer
+		*/
+		u32Respones = stCmd.resp.cmd_rsp0;
+
+		/* Check if card busy bit is cleared or not */
+		if (!(u32Respones & MMC_CARD_BUSY)) {
+			debug("Card Busy!");
+			continue;
+		}
+
+		u32VoltageValidation = 0;
+
+		/* Check if volatge lies in range or not*/
+		if (0x40000000 == (u32Respones & 0x60000000)) {
+			debug("Address_mode: SECT_MODE");
+			g_Card_Address_Mode = CARD_SUPPORT_SECT_MODE;
+		} else {
+			debug("Address_mode: BYTE_MODE");
+			g_Card_Address_Mode = CARD_SUPPORT_BYTE_MODE;
+		}
+	}
+
+	debug("mmc_voltage_validation succeed! :)");
+
+	debug("Exit: mmc_voltage_validation");
+
+	return u32VoltageValidation;
+}
+
+static s32 mmc_send_cid(struct mmc_card *card)
+{
+	struct mmc_command stCmd;
+	s32 s32Rslt = EPERM;
+
+	debug("Entry: mmc_send_cid");
+
+	if (!card) {
+		debug("NULL card pointer!");
+		return EPERM;
+	}
+
+	memset(&stCmd, 0, sizeof(struct	mmc_command));
+
+	s32Rslt	= mmc_cmd(&stCmd,
+			MMC_ALL_SEND_CID,
+			0,
+			READ,
+			RESPONSE_136,
+			DATA_PRESENT_NONE,
+			ENABLE,
+			DISABLE);
+
+	/* Issue CMD55 to SD Memory card*/
+	if (s32Rslt) {
+		debug("Send MMC_ALL_SEND_CID Failed! :(");
+		return EPERM;
+	}
+
+	/*
+	card->raw_cid[0] = stCmd.resp.cmd_rsp0;
+	card->raw_cid[1] = stCmd.resp.cmd_rsp1;
+	card->raw_cid[2] = stCmd.resp.cmd_rsp2;
+	card->raw_cid[3] = stCmd.resp.cmd_rsp3;
+	*/
+
+	card->raw_cid[0] = (stCmd.resp.cmd_rsp3 << 8) | \
+				(stCmd.resp.cmd_rsp2 >> 24);
+	card->raw_cid[1] = (stCmd.resp.cmd_rsp2 << 8) | \
+				(stCmd.resp.cmd_rsp1 >> 24);
+	card->raw_cid[2] = (stCmd.resp.cmd_rsp1 << 8) | \
+				(stCmd.resp.cmd_rsp0 >> 24);
+	card->raw_cid[3] = stCmd.resp.cmd_rsp0 << 8;
+
+	debug("mmc_send_cid succeed! :)");
+
+	debug("Exit: mmc_send_cid");
+
+	return 0;
+}
+
+static s32 mmc_send_csd(struct mmc_card *card, u32 u32CardRCA)
+{
+	struct mmc_command stCmd;
+	s32 s32Rslt = EPERM;
+
+	debug("Entry: mmc_send_csd");
+
+	if (!card) {
+		debug("NULL card pointer!");
+		return s32Rslt;
+	}
+
+	memset(&stCmd, 0, sizeof(struct	mmc_command));
+
+	s32Rslt	= mmc_cmd(&stCmd,
+			MMC_SEND_CSD,
+			(u32CardRCA << 16),
+			READ,
+			RESPONSE_136,
+			DATA_PRESENT_NONE,
+			ENABLE,
+			DISABLE);
+
+	 /* Issue CMD55 to SD Memory card*/
+	 if (s32Rslt) {
+		debug("Send MMC_SEND_CSD Failed! :(");
+		return EPERM;
+	 }
+
+	 /*
+	card->raw_csd[0] = stCmd.resp.cmd_rsp0;
+	card->raw_csd[1] = stCmd.resp.cmd_rsp1;
+	card->raw_csd[2] = stCmd.resp.cmd_rsp2;
+	card->raw_csd[3] = stCmd.resp.cmd_rsp3;
+	*/
+
+	card->raw_csd[0] = (stCmd.resp.cmd_rsp3 << 8) | \
+				(stCmd.resp.cmd_rsp2 >> 24);
+	card->raw_csd[1] = (stCmd.resp.cmd_rsp2 << 8) | \
+				(stCmd.resp.cmd_rsp1 >> 24);
+	card->raw_csd[2] = (stCmd.resp.cmd_rsp1 << 8) | \
+				(stCmd.resp.cmd_rsp0 >> 24);
+	card->raw_csd[3] = stCmd.resp.cmd_rsp0 << 8;
+
+	debug("mmc_send_csd succeed! :)");
+
+	debug("Exit: mmc_send_csd");
+
+	return 0;
+}
+
+static s32 mmc_select_card(u32 card_rca)
+{
+	struct mmc_command stCmd;
+	s32 s32Rslt = EPERM;
+	u32 u32CardAddr = card_rca << 16;
+
+	debug("Entry: mmcsd_set_data_transfer_mode");
+
+	memset(&stCmd, 0, sizeof(struct	mmc_command));
+
+	s32Rslt	= mmc_cmd(&stCmd,
+			MMC_SELECT_CARD,
+			u32CardAddr,
+			READ,
+			RESPONSE_48,
+			DATA_PRESENT_NONE,
+			ENABLE,
+			ENABLE);
+	if (s32Rslt) {
+		debug("Send MMC_SELECT_CARD Failed! :(");
+		return EPERM;
+	}
+
+	debug("Exit mmcsd_set_data_transfer_mode");
+
+	return mmcsd_check_status(card_rca, 96, TRAN, R1_ERROR);
+}
+
+static s32 mmcsd_check_status(u32 card_rca, u32 timeout, \
+				u32 card_state, u32 status_bit)
+{
+	struct mmc_command stCmd;
+	s32 s32Rslt = EPERM;
+	s32 s32Retries = 0;
+	u32 u32CardAddr	= card_rca << 16;
+	s32 s32Status =	1;
+
+	debug("Entry: mmcsd_check_status");
+
+	memset(&stCmd, 0, sizeof(struct	mmc_command));
+
+	for (s32Retries = 10; s32Retries; --s32Retries)	{
+
+		udelay(timeout);
+
+		s32Rslt	= mmc_cmd(&stCmd,
+			MMC_SEND_STATUS,
+			u32CardAddr,
+			READ,
+			RESPONSE_48,
+			DATA_PRESENT_NONE,
+			ENABLE,
+			ENABLE);
+		if (s32Rslt) {
+			debug("Send MMC_SEND_STATUS Failed!	:(");
+			break;
+		}
+
+		if (stCmd.resp.cmd_rsp0 & status_bit) {
+			debug("R1 Error! :(");
+			break;
+		}
+
+		if (R1_CURRENT_STATE(stCmd.resp.cmd_rsp0) == card_state) {
+			debug("Get state! :)");
+			s32Status = 0;
+			break;
+		}
+	}
+
+	debug("Exit: mmcsd_check_status");
+
+	return s32Status;
+}
+
+static s32 mmc_send_relative_addr(u32 *u32CardRCA)
+{
+	struct mmc_command stCmd;
+	s32 s32Status = 1;
+	s32	s32Rslt	= EPERM;
+
+	debug("Entry: mmc_send_relative_addr");
+
+	memset(&stCmd, 0, sizeof(struct	mmc_command));
+
+	s32Rslt	= mmc_cmd(&stCmd,
+			SD_SEND_RELATIVE_ADDR,
+			0,
+			READ,
+			RESPONSE_48,
+			DATA_PRESENT_NONE,
+			ENABLE,
+			ENABLE);
+	if (s32Rslt) {
+		debug("Send SD_SEND_RELATIVE_ADDR Failed! :(");
+		return s32Status;
+	}
+
+	*u32CardRCA = (u32)stCmd.resp.cmd_rsp0 >> 16;
+
+	if (R1_CURRENT_STATE(stCmd.resp.cmd_rsp0) != IDENT) {
+		debug("Invalid R1 State! :(");
+		return s32Status;
+	}
+
+	debug("Exit: mmc_send_relative_addr");
+
+	return 0;
+}
+
+static s32 mmc_set_relative_addr(u32 u32CardRCA)
+{
+	struct mmc_command stCmd;
+	s32	s32Rslt	= EPERM;
+
+	debug("Entry: mmc_set_relative_addr");
+
+	memset(&stCmd, 0, sizeof(struct	mmc_command));
+
+	/* Set RCA */
+	s32Rslt	= mmc_cmd(&stCmd,
+			MMC_SET_RELATIVE_ADDR,
+			(u32CardRCA	<< 16),
+			READ,
+			RESPONSE_48,
+			DATA_PRESENT_NONE,
+			ENABLE,
+			ENABLE);
+	if (s32Rslt) {
+		debug("Send MMC_SET_RELATIVE_ADDR Failed! :(");
+		return 1;
+	}
+
+	if (R1_CURRENT_STATE(stCmd.resp.cmd_rsp0) != IDENT) {
+		debug("Invalid R1 State! :(");
+		return 1;
+	}
+
+	debug("Exit: mmc_set_relative_addr");
+
+	return 0;
+}
+
+static s32 mmc_send_scr(struct mmc_card *card)
+{
+	struct mmc_command stCmd;
+	s32 s32Rslt = EPERM;
+
+	debug("Entry: mmc_app_send_scr");
+
+	if (!card) {
+		debug("NULL card pointer!");
+		return s32Rslt;
+	}
+
+	memset(&stCmd, 0, sizeof(struct	mmc_command));
+
+	s32Rslt	= mmc_acmd(&stCmd,
+			SD_APP_SEND_SCR,
+			0,
+			READ,
+			RESPONSE_48,
+			DATA_PRESENT_NONE,
+			ENABLE,
+			ENABLE);
+
+	 /* Issue CMD55 to SD Memory card*/
+	 if (s32Rslt) {
+		debug("Send SD_APP_SEND_SCR Failed! :(");
+		return EPERM;
+	 }
+
+	card->raw_scr[0] = stCmd.resp.cmd_rsp0;
+	card->raw_scr[1] = stCmd.resp.cmd_rsp1;
+
+	mmc_decode_scr(card);
+
+	debug("mmc_send_scr succeed! :)");
+
+	debug("Exit: mmc_app_send_scr");
+
+	return 0;
+}
+
+static s32 mmc_decode_scr(struct mmc_card *card)
+{
+	struct sd_scr *scr = &card->scr;
+	unsigned int scr_struct;
+	u32 resp[4];
+
+	resp[3] = card->raw_scr[1];
+	resp[2] = card->raw_scr[0];
+
+	scr_struct = UNSTUFF_BITS(resp, 60, 4);
+	if (scr_struct != 0) {
+		printf("Unrecognised SCR structure version %d\n", scr_struct);
+		return 1;
+	}
+
+	scr->sda_vsn = UNSTUFF_BITS(resp, 56, 4);
+	scr->bus_widths = UNSTUFF_BITS(resp, 48, 4);
+
+	return 0;
+}
+
+static s32 mmc_read_switch(struct mmc_card *card)
+{
+	u8 status[64] = { 0 };
+
+	if (card->scr.sda_vsn < SCR_SPEC_VER_1)
+		return 0;
+
+	if (!(card->csd.cmdclass & CCC_SWITCH)) {
+		printf("card lacks mandatory switch "
+			"function, performance might suffer.\n");
+		return 0;
+	}
+
+	if (mmc_sd_switch(card, 0, 0, 1, status)) {
+		/*
+		 * We all hosts that cannot perform the command
+		 * to fail more gracefully
+		 */
+		printf("problem reading switch "
+			"capabilities, performance might suffer.\n");
+
+		return 1;
+	}
+
+	if (status[13] & 0x02)
+		card->sw_caps.hs_max_dtr = 50000000;
+
+	return 0;
+}
+
+static s32 mmc_sd_switch(struct mmc_card *card, s32 mode, s32 group,
+						u8 value, u8 *resp)
+{
+	struct mmc_command stCmd;
+	s32 s32Rslt = EPERM;
+	u32 u32Args = 0;
+
+	debug("Entry: mmc_sd_switch");
+
+	if (!card) {
+		debug("NULL card pointer!");
+		return s32Rslt;
+	}
+
+	memset(&stCmd, 0, sizeof(struct	mmc_command));
+
+	u32Args = mode << 31 | 0x00FFFFFF;
+	u32Args &= ~(0xF << (group * 4));
+	u32Args |= value << (group * 4);
+
+	s32Rslt	= mmc_acmd(&stCmd,
+			SD_SWITCH,
+			u32Args,
+			READ,
+			RESPONSE_48,
+			DATA_PRESENT,
+			ENABLE,
+			ENABLE);
+
+	 /* Issue CMD55 to SD Memory card*/
+	 if (s32Rslt) {
+		debug("Send SD_SWITCH Failed! :(");
+		return EPERM;
+	 }
+
+	return 0;
+}
+
+static s32 mmc_app_set_bus_width(s32 width)
+{
+	struct mmc_command stCmd;
+	s32 s32Rslt = EPERM;
+
+	debug("Entry: mmc_app_set_bus_width");
+
+	memset(&stCmd, 0, sizeof(struct	mmc_command));
+
+	s32Rslt	= mmc_acmd(&stCmd,
+			SD_APP_SET_BUS_WIDTH,
+			width,
+			READ,
+			RESPONSE_48,
+			DATA_PRESENT_NONE,
+			ENABLE,
+			ENABLE);
+
+	if (s32Rslt) {
+		debug("Send SD_APP_SET_BUS_WIDTH Failed! :(");
+		return EPERM;
+	 }
+
+	debug("Exit: mmc_app_set_bus_width");
+
+	return 0;
+}
+
+static s32 mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value)
+{
+	struct mmc_command stCmd;
+	s32 s32Rslt = EPERM;
+	u32 u32Args = 0;
+
+	debug("Entry: mmc_sd_switch");
+
+	if (!card) {
+		debug("NULL card pointer!");
+		return s32Rslt;
+	}
+
+	memset(&stCmd, 0, sizeof(struct	mmc_command));
+
+	u32Args = (MMC_SWITCH_MODE_WRITE_BYTE << 24) |
+				(index << 16) | (value << 8) | set;
+
+	s32Rslt	= mmc_cmd(&stCmd,
+			MMC_SWITCH,
+			u32Args,
+			READ,
+			RESPONSE_48,
+			DATA_PRESENT_NONE,
+			ENABLE,
+			ENABLE);
+
+	/* Issue CMD55 to SD Memory card*/
+	if (s32Rslt) {
+		debug("Send SD_SWITCH Failed! :(");
+		return EPERM;
+	}
+
+	debug("Entry: mmc_sd_switch");
+
+	return 0;
+}
+
+
+static s32 mmc_init_sd(struct mmc_card *card)
+{
+	u32 u32CardRCA = 0;
+
+	if (mmc_send_cid(card)) {
+		debug("mmcsd_get_cid Failed! :(");
+		return 1;
+	}
+
+	if (mmc_send_relative_addr(&u32CardRCA)) {
+		debug("sd_send_relative_addr Failed! :(");
+		return 1;
+	}
+
+	if (mmc_send_csd(card, u32CardRCA)) {
+		debug("mmcsd_get_csd Failed! :(");
+		return 1;
+	}
+
+	g_Card_rca = u32CardRCA;
+
+	mmc_decode_csd(card);
+	mmc_decode_cid(card);
+
+	/* Enable operating	frequency */
+	interface_configure_clock(OPERATING_FREQ);
+
+	if (mmc_select_card(u32CardRCA)) {
+		debug("mmc_select_card Failed! :(");
+		return 1;
+	}
+
+	if (mmcsd_check_status(g_Card_rca, 96, TRAN, R1_ERROR)) {
+		debug("Can't wait for TRAN state! :(\n");
+		return EPERM;
+	}
+
+	if (mmc_set_blk_len(BLK_LEN)) {
+		debug("mmc_set_blk_len Failed! :(");
+		return EPERM;
+	}
+
+	/*
+	if (mmc_send_scr(card)) {
+		debug("mmc_send_scr Failed! :(");
+		return 1;
+	}
+	*/
+
+	if (mmc_app_set_bus_width(SD_BUS_WIDTH_4)) {
+		/* Try to set 1 bit mode */
+		if (mmc_app_set_bus_width(SD_BUS_WIDTH_1)) {
+			debug("mmc_app_set_bus_width Failed");
+			return EPERM;
+		}
+		interface_set_bus_width(SD_BUS_WIDTH_1);
+	} else {
+		interface_set_bus_width(SD_BUS_WIDTH_4);
+	}
+
+	return 0;
+}
+
+static s32 mmc_init_mmc(struct mmc_card *card)
+{
+	u32 u32CardRCA = 1;
+
+	/* mmc init */
+	if (mmc_send_cid(card)) {
+		debug("mmcsd_get_cid Failed! :(");
+		return 1;
+	}
+
+	/* Set RCA */
+	if (mmc_set_relative_addr(u32CardRCA)) {
+		debug("mmc_set_relative_addr Failed! :(");
+		return 1;
+	}
+
+	if (mmc_send_csd(card, u32CardRCA)) {
+		debug("mmcsd_get_csd Failed! :(");
+		return 1;
+	}
+
+	g_Card_rca = u32CardRCA;
+
+	mmc_decode_csd(card);
+	mmc_decode_cid(card);
+
+	/* Enable operating frequency */
+	interface_configure_clock(OPERATING_FREQ);
+
+	if (mmc_select_card(u32CardRCA)) {
+		debug("mmc_select_card Failed! :(");
+		return 1;
+	}
+
+	if (mmcsd_check_status(g_Card_rca, 96, TRAN, R1_ERROR)) {
+		debug("Can't wait for TRAN state! :(\n");
+		return EPERM;
+	}
+
+	if (mmc_set_blk_len(BLK_LEN)) {
+		debug("mmc_set_blk_len Failed! :(");
+		return 1;
+	}
+
+	if (card->csd.mmca_vsn >= CSD_SPEC_VER_4) {
+		if (mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
+			EXT_CSD_BUS_WIDTH, EXT_CSD_BUS_WIDTH_4)) {
+			debug("Switch card to 4 bits failed! :(\n");
+			return 1;
+		}
+		interface_set_bus_width(MMC_BUS_WIDTH_4);
+	}
+
+	return 0;
+}
+
+int
+/****************************************************/
+mmc_init(int verbose)
+/****************************************************/
+{
+	struct mmc_command stCmd;
+	s32	s32InitStatus =	-1;
+	struct mmc_card	card;
+	s32	s32Rslt	= EPERM;
+
+	debug("Entry: mmc_init");
+
+	memset(&stCmd, 0, sizeof(struct	mmc_command));
+	memset(&card, 0, sizeof(struct mmc_card));
+
+	g_Card_rca = 0;
+
+	/* Reset device	interface type */
+	mmc_dev.if_type	= IF_TYPE_UNKNOWN;
+
+	/* initialize Interface	Controller */
+	sdhc_init();
+
+	/* Software reset to Interface Controller */
+	if (interface_reset()) {
+		debug("interface_reset failed! :(");
+		return s32InitStatus;
+	}
+
+	/* Enable Identification Frequency */
+	interface_configure_clock(IDENTIFICATION_FREQ);
+
+	/* Software reset */
+	s32Rslt	= mmc_cmd(&stCmd,
+			MMC_GO_IDLE_STATE,
+			0,
+			READ,
+			RESPONSE_NONE,
+			DATA_PRESENT_NONE,
+			DISABLE,
+			DISABLE);
+
+	if (!sd_voltage_validation()) {
+		debug("SD Card Detected!");
+		card.type = MMC_TYPE_SD;
+
+		/* SD init */
+		if (mmc_init_sd(&card)) {
+			debug("mmc_init_sd Failed! :(");
+			return s32InitStatus;
+		}
+
+		s32InitStatus = 0;
+		mmc_ready = 1;
+	} else if (!mmc_voltage_validation()) {
+		debug("MMC Card	Detected!");
+		card.type = MMC_TYPE_MMC;
+
+		/* mmc init	*/
+		if (mmc_init_mmc(&card)) {
+			debug("mmc_init_mmc Failed! :(");
+			return s32InitStatus;
+		}
+
+		s32InitStatus = 0;
+		mmc_ready = 1;
+	} else {
+		mmc_ready = 0;
+		return s32InitStatus;
+	}
+
+	fat_register_device(&mmc_dev, 1); /* partitions start counting with 1 */
+
+	debug("Exit: mmc_init");
+
+	return s32InitStatus;
+}
+
+int mmc_ident(block_dev_desc_t *dev)
+{
+	return 0;
+}
+
+int mmc2info(ulong addr)
+{
+	/* Not avaiable for cp command now. */
+	return 0;
+
+	if (addr >= CONFIG_MMC_BASE
+	    && addr < CONFIG_MMC_BASE + (mmc_dev.lba * mmc_dev.blksz)) {
+		return 1;
+	}
+	return 0;
+
+}
+
+#endif /* CONFIG_MMC */
+