u-boot.git/drivers/mmc, branch v2014.04

Merge branch 'u-boot/master' into 'u-boot-arm/master'

2014-04-08T07:25:08+00:00

Conflicts:
	arch/arm/cpu/arm926ejs/mxs/Makefile
	include/configs/trats.h
	include/configs/trats2.h
	include/mmc.h

mmc:eSDHC: Workaround for data timeout issue on Txxx SoC

2014-04-02T10:25:01+00:00

1. The Data timeout counter value in eSDHC_SYSCTL register is
not working as it should be, so add quirks to enable this
workaround to fix it to the max value 0xE.

2. Add CONFIG_SYS_FSL_ERRATUM_ESDHC111 to enable its workaround.

* Update of patch for change mmc interface by
	Pantelis Antoniou 

Signed-off-by: Haijun Zhang 
Acked-by: Pantelis Antoniou

mmc: fsl_esdhc: add controller reset in case of data related errors too

2014-04-02T10:17:12+00:00

The controller reset is performed now if command error occurs.
This commit adds the reset for the case of data related errors too.

Signed-off-by: Andrew Gabbasov 
Acked-by: Pantelis Antoniou

mmc: fsl_esdhc: fix calculation of timeout for data transactions

2014-04-02T10:16:56+00:00

Calculation of the timeout value should be based on actual clock value,
written to controller registers. Since mmc->tran_speed is either the
maximum allowed speed, or the preliminary value, that is be not yet
set to registers, the actual timeout, taken by the controller, based
on its clock settings, may be much longer than expected, based on
mmc->tran_speed value. In particular it happens at early initialization
stage, when typical value of mmc->tran_speed is 20MHz or 26MHz, while
actual clock setting, configured in the controller, is 400kHz.
It's more correct to use mmc->clock value for timeout calculation instead.

Signed-off-by: Andrew Gabbasov 
Acked-by: Pantelis Antoniou

mmc: Add 'mmc rst-function' sub-command

2014-04-02T10:02:58+00:00

Some eMMC chips may need the RST_n_FUNCTION bit set to a non-zero value
in order for warm reset of the system to work.  Details on this being
required will be part of the eMMC datasheet.  Also add using this
command to the dra7xx README.

* Whitespace fix by panto

Signed-off-by: Tom Rini 
Acked-by: Pantelis Antoniou

mmc: sh_mmcif: Fix warning by unused variable

2014-04-02T09:55:48+00:00

Signed-off-by: Nobuhiro Iwamatsu 
Reported-by: Masahiro Yamada 
Acked-by: Pantelis Antoniou

mmc: sh_mmcif: Fix compile error

2014-04-02T09:55:31+00:00

BY commit "mmc: Split mmc struct, rework mmc initialization (v2)",
sh_mmcif has compile error. This fixes compile error.

Signed-off-by: Nobuhiro Iwamatsu 
CC: Pantelis Antoniou 
Reported-by: Masahiro Yamada 
Acked-by: Pantelis Antoniou

blackfin: mmc: Correct mmc_host_is_spi and bfin_sdh.c

2014-03-28T20:55:29+00:00

In the recent mmc cleanup, the mmc_host_is_spi macro was broken and
bfin_sdh.c had mmc->bus_width turned into mmc_bus_width(mmc), both of
which were incorrect.

Signed-off-by: Tom Rini

mmc: Split mmc struct, rework mmc initialization (v2)

2014-03-24T10:58:56+00:00

The way that struct mmc was implemented was a bit of a mess;
configuration and internal state all jumbled up in a single structure.

On top of that the way initialization is done with mmc_register leads
to a lot of duplicated code in drivers.

Typically the initialization got something like this in every driver.

	struct mmc *mmc = malloc(sizeof(struct mmc));
	memset(mmc, 0, sizeof(struct mmc);
	/* fill in fields of mmc struct */
	/* store private data pointer */
	mmc_register(mmc);

By using the new mmc_create call one just passes an mmc config struct
and an optional private data pointer like this:

	struct mmc = mmc_create(&cfg, priv);

All in tree drivers have been updated to the new form, and expect
mmc_register to go away before long.

Changes since v1:

* Use calloc instead of manually calling memset.
* Mark mmc_register as deprecated.

Signed-off-by: Pantelis Antoniou

mmc: Convert mmc struct's name array to a pointer

2014-03-24T09:32:10+00:00

Using an array is pointless; even more pointless (and scary) is using
sprintf to fill it without a format string.

Signed-off-by: Pantelis Antoniou