[U-Boot] [PATCH V5 03/10] DWMMC: Initialise dwmci and resolve EMMC read write issues

[Simon Glass]

On Mon, Jan 21, 2013 at 3:43 AM, Amar <amarendra.xt at samsung.com> wrote:
> This patch enumerates dwmci and set auto stop command during
> dwmci initialisation.
> EMMC read/write is not happening in current implementation
> due to improper fifo size computation. Hence Modified the fifo size
> computation to resolve EMMC read write issues.
>
> Signed-off-by: Amar <amarendra.xt at samsung.com>

Acked-by: Simon Glass <sjg at chromium.org>

(nit below if you resend for other reason)

> ---
> Changes since V1:
>         1)Created the macros RX_WMARK_SHIFT and RX_WMARK_MASK in header file.
>
> Changes since V2:
>         1)Updation of commit message and resubmition of proper patch set.
>
> Changes since V3:
>         1)Updated to use the macro DWMCI_CTRL_SEND_AS_CCSD instead of
>         the hard coded value (1 << 10).
>
> Changes since V4:
>         1)Updated the function dwmci_send_cmd() to use get_timer() instead
>         of using mdelay(1).
>
>  drivers/mmc/dw_mmc.c | 23 ++++++++++++++++-------
>  1 file changed, 16 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
> index 4070d4e..391ed93 100644
> --- a/drivers/mmc/dw_mmc.c
> +++ b/drivers/mmc/dw_mmc.c

> @@ -323,6 +322,14 @@ static int dwmci_init(struct mmc *mmc)
>                 return -1;
>         }
>
> +       /* Enumerate at 400KHz */
> +       dwmci_setup_bus(host, mmc->f_min);
> +
> +       /* Set auto stop command */
> +       ier = dwmci_readl(host, DWMCI_CTRL);
> +       ier |= DWMCI_CTRL_SEND_AS_CCSD;
> +       dwmci_writel(host, DWMCI_CTRL, ier);
> +
>         dwmci_writel(host, DWMCI_RINTSTS, 0xFFFFFFFF);
>         dwmci_writel(host, DWMCI_INTMASK, 0);
>
> @@ -332,11 +339,13 @@ static int dwmci_init(struct mmc *mmc)
>         dwmci_writel(host, DWMCI_BMOD, 1);
>
>         fifo_size = dwmci_readl(host, DWMCI_FIFOTH);
> +       fifo_size = ((fifo_size & RX_WMARK_MASK) >> RX_WMARK_SHIFT) + 1;
>         if (host->fifoth_val)
>                 fifoth_val = host->fifoth_val;

should be {} around this I think.

> -       else
> -               fifoth_val = MSIZE(0x2) | RX_WMARK(fifo_size/2 -1) |
> -                       TX_WMARK(fifo_size/2);
> +       else {
> +               fifoth_val = MSIZE(0x2) | RX_WMARK(fifo_size / 2 - 1) |
> +                       TX_WMARK(fifo_size / 2);
> +       }
>         dwmci_writel(host, DWMCI_FIFOTH, fifoth_val);
>
>         dwmci_writel(host, DWMCI_CLKENA, 0);
> --
> 1.8.0
>