From 03439e4064a9aff6185d081540a97e7afc32ac31 Mon Sep 17 00:00:00 2001
From: Marek Vasut <marex@denx.de>
Date: Mon, 3 Aug 2015 18:31:51 +0200
Subject: [PATCH] arm: socfpga: Add temporary workaround for missing SD/MMC
patches
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(+)
diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c
index 002e340b47..f617e88df1 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);
}
--
2.39.5