Add a small workaround into the platform code which forces the SDMMC into 8-bit mode (the default configuration for all socfpga platforms) to work around breakage caused by missing patches in mainline which switch the probing of SD/MMC to OF instead of static configuraiton.

The patches will hit mainline after the SPL series, so to avoid build issues, add this small temporary workaround.

Signed-off-by: Marek Vasut marex@denx.de --- arch/arm/mach-socfpga/misc.c | 6 ++++++ 1 file changed, 6 insertions(+)

Tom, I hope you don't mind this one very much, I need it to get this series in without build issues and without the MMC patches which are still waiting for Panto to review. Once Panto is less busy, he can pick the MMC patches which zap this horribleness.

diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c index 002e340..f617e88 100644 --- a/arch/arm/mach-socfpga/misc.c +++ b/arch/arm/mach-socfpga/misc.c @@ -123,6 +123,12 @@ 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); }