]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
arm: socfpga: Add temporary workaround for missing SD/MMC patches
authorMarek Vasut <marex@denx.de>
Mon, 3 Aug 2015 16:31:51 +0000 (18:31 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Thu, 10 Sep 2015 06:17:34 +0000 (08:17 +0200)
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

index 002e340b4751fd137a132c74239f6a5b94867fa9..f617e88df1aaede02ab3344dd5d3deb8ce09dc66 100644 (file)
@@ -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);
 }