u-boot.git/drivers/mmc, branch v2015.01-rc2

Merge branch 'master' of git://www.denx.de/git/u-boot-imx

2014-11-24T17:02:12Z

linux/kernel.h: sync min, max, min3, max3 macros with Linux

2014-11-23T11:48:30Z

U-Boot has never cared about the type when we get max/min of two values, but Linux Kernel does. This commit gets min, max, min3, max3 macros synced with the kernel introducing type checks. Many of references of those macros must be fixed to suppress warnings. We have two options: - Use min, max, min3, max3 only when the arguments have the same type (or add casts to the arguments) - Use min_t/max_t instead with the appropriate type for the first argument Signed-off-by: Masahiro Yamada Acked-by: Pavel Machek Acked-by: Lukasz Majewski Tested-by: Lukasz Majewski [trini: Fixup arch/blackfin/lib/string.c] Signed-off-by: Tom Rini

mmc: fsl_esdhc: Update esdhc driver for iMX6SX

2014-11-20T09:44:42Z

The reset value of "uSDHCx_INT_STATUS_EN" register is changed to 0 on iMX6SX. So the fsl_esdhc driver must update to set the register, otherwise no state can be detected. Signed-off-by: Ye.Li

sort drivers/mmc/Makefile

2014-11-07T21:27:04Z

Sort drivers/mmc makefile, as requested by wd. Signed-off-by: Pavel Machek Acked-by: Chin Liang See

omap: hsmmc: assume cd gpio is active low

2014-11-06T16:04:41Z

Switch the default CD GPIO polarity to active low. The current hsmmc driver assumption that the CD GPIO is active high, but in the real hardware, usually the opposite holds. The usual SD card socket has a mechanical switch which is grounded as soon as a card is inserted. Of course there might be some board logic which inverts the signal, but as far as current users are concerned, there is no such logic. Current U-Boot users either not using the CD functionality, or have a different way (e.g. external to SoC GPIO controller) for checking the card presence. This patch also brings the polarity assumption in line with the Linux kernel and adds appropriate comments. This patch also might spare issues once the TWL GPIO driver will be converted to the DM. Signed-off-by: Igor Grinberg Cc: Pantelis Antoniou Cc: Dmitry Lifshitz Reviewed-by: Tom Rini

dm: sunxi: Request card detect gpio

2014-11-05T12:10:13Z

This is necessary for the device-model enabled builds to work properly. Signed-off-by: Hans de Goede Acked-by: Simon Glass

sunxi: Use CONFIG_MACH_SUN?I from Kconfig instead of CONFIG_SUN?I

2014-11-05T12:09:58Z

Mostly automatic with: sed -i -e 's/CONFIG_$SUN[45678]I$/CONFIG_MACH_\1/g' $(git grep -l CONFIG_SUN[45678]I) followed by removing the relevant #defines from include/configs/sun?i.h by hand. Signed-off-by: Ian Campbell Reviewed-by: Hans de Goede Signed-off-by: Hans de Goede

mmc: s5p: set SD detection pin as input

2014-10-28T01:20:51Z

The SD Card slot detection pin should be configured as input. Signed-off-by: Przemyslaw Marczak Acked-by: Simon Glass

Merge http://git.denx.de/u-boot-sunxi

2014-10-26T18:13:24Z

Merge git://git.denx.de/u-boot-dm

2014-10-26T18:03:08Z

Fix a trivial conflict over adding Conflicts: arch/arm/cpu/armv7/omap3/board.c Signed-off-by: Tom Rini