diff options
| author | Marek Vasut <marex@denx.de> | 2015-07-25 10:48:14 +0200 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2015-09-04 11:54:20 +0200 |
| commit | 129adf5bf4769cd93f05e53e6aab724894c31036 (patch) | |
| tree | 9b3ab9ecb98ca258ec029e90efec3f7d72795604 /arch/arm/mach-socfpga | |
| parent | 6015f8f1b6fc30de7b4839bd691058583ec7f521 (diff) | |
| download | talos-obmc-uboot-129adf5bf4769cd93f05e53e6aab724894c31036.tar.gz talos-obmc-uboot-129adf5bf4769cd93f05e53e6aab724894c31036.zip | |
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>
Diffstat (limited to 'arch/arm/mach-socfpga')
| -rw-r--r-- | arch/arm/mach-socfpga/include/mach/dwmmc.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-socfpga/misc.c | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm/mach-socfpga/include/mach/dwmmc.h b/arch/arm/mach-socfpga/include/mach/dwmmc.h index 945eb646ce..e8ba901047 100644 --- a/arch/arm/mach-socfpga/include/mach/dwmmc.h +++ b/arch/arm/mach-socfpga/include/mach/dwmmc.h @@ -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_ */ diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c index 6128d54b18..0940cc5a4f 100644 --- a/arch/arm/mach-socfpga/misc.c +++ b/arch/arm/mach-socfpga/misc.c @@ -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 |
