From: Roy Zang tie-fei.zang@freescale.com

When we set the read or write watermark in WML we should maintain the rest of the register as is, rather than using some hard coded value.

Signed-off-by: Roy Zang tie-fei.zang@freescale.com Acked-by: Stefano Babic sbabic@denx.de Signed-off-by: Kumar Gala galak@kernel.crashing.org --- * Fixed line length

drivers/mmc/fsl_esdhc.c | 9 ++++----- include/fsl_esdhc.h | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index 999b581..0f6f8b1 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -110,8 +110,7 @@ static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data) if (wml_value > 0x10) wml_value = 0x10;

- wml_value = 0x100000 | wml_value; - + esdhc_clrsetbits32(&regs->wml, WML_RD_WML_MASK, wml_value); esdhc_write32(&regs->dsaddr, (u32)data->dest); } else { if (wml_value > 0x80) @@ -120,12 +119,12 @@ static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data) printf("\nThe SD card is locked. Can not write to a locked card.\n\n"); return TIMEOUT; } - wml_value = wml_value << 16 | 0x10; + + esdhc_clrsetbits32(&regs->wml, WML_WR_WML_MASK, + wml_value << 16); esdhc_write32(&regs->dsaddr, (u32)data->src); }

- esdhc_write32(&regs->wml, wml_value); - esdhc_write32(&regs->blkattr, data->blocks << 16 | data->blocksize);

/* Calculate the timeout period for data transactions */ diff --git a/include/fsl_esdhc.h b/include/fsl_esdhc.h index 5f02018..f9ae15a 100644 --- a/include/fsl_esdhc.h +++ b/include/fsl_esdhc.h @@ -133,6 +133,8 @@

#define WML 0x2e044 #define WML_WRITE 0x00010000 +#define WML_RD_WML_MASK 0xff +#define WML_WR_WML_MASK 0xff0000

#define BLKATTR 0x2e004 #define BLKATTR_CNT(x) ((x & 0xffff) << 16)