From: Marek Vasut Date: Mon, 3 Aug 2015 16:31:51 +0000 (+0200) Subject: arm: socfpga: Add temporary workaround for missing SD/MMC patches X-Git-Tag: KARO-TX6-2015-09-18~590 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=6f4e80abb6dc7c62e578fb6c276c56c5e497dfd2 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 --- 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); }