mmc: dw_mmc: Probe the MMC from OF

Rework the driver to probe the MMC controller from Device Tree
and make it mandatory. There is no longer support for probing
from the ancient qts-generated header files.

This patch now also removes previous temporary workaround.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
Cc: Tom Rini <trini@konsulko.com>
This commit is contained in:
Marek Vasut
2015-07-25 10:48:14 +02:00
parent 6015f8f1b6
commit 129adf5bf4
5 changed files with 72 additions and 22 deletions

View File

@@ -7,6 +7,6 @@
#ifndef _SOCFPGA_DWMMC_H_
#define _SOCFPGA_DWMMC_H_
extern int socfpga_dwmmc_init(u32 regbase, int bus_width, int index);
int socfpga_dwmmc_init(const void *blob);
#endif /* _SOCFPGA_SDMMC_H_ */

View File

@@ -125,14 +125,7 @@ int cpu_eth_init(bd_t *bis)
*/
int cpu_mmc_init(bd_t *bis)
{
/*
* FIXME: Temporarily define CONFIG_HPS_SDMMC_BUSWIDTH to prevent breakage
* due to missing patches in u-boot/master . The upcoming patch will
* switch this to OF probing, so this whole block will go away.
*/
#define CONFIG_HPS_SDMMC_BUSWIDTH 8
return socfpga_dwmmc_init(SOCFPGA_SDMMC_ADDRESS,
CONFIG_HPS_SDMMC_BUSWIDTH, 0);
return socfpga_dwmmc_init(gd->fdt_blob);
}
#endif