summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorDinh Nguyen <dinguyen@opensource.altera.com>2015-12-02 13:31:33 -0600
committerMarek Vasut <marex@denx.de>2015-12-20 03:44:56 +0100
commita1684b61054714daae7250e570fe3298f86605b7 (patch)
tree210b22842979b46e669bd3b39cc5f081019d42e1 /arch
parente5ad7d9889f6c2af625449dcb4487a3936709e50 (diff)
downloadu-boot-imx-a1684b61054714daae7250e570fe3298f86605b7.zip
u-boot-imx-a1684b61054714daae7250e570fe3298f86605b7.tar.gz
u-boot-imx-a1684b61054714daae7250e570fe3298f86605b7.tar.bz2
arm: socfpga: fix up a questionable macro for SDMMC
Move the macro into the socfpga_dwmci_clksel(). Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> Signed-off-by: Marek Vasut <marex@denx.de> [fix parenthesis in the sdmmc_mask]
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-socfpga/include/mach/system_manager.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-socfpga/include/mach/system_manager.h b/arch/arm/mach-socfpga/include/mach/system_manager.h
index 8712f8e..c45edea 100644
--- a/arch/arm/mach-socfpga/include/mach/system_manager.h
+++ b/arch/arm/mach-socfpga/include/mach/system_manager.h
@@ -129,9 +129,13 @@ struct socfpga_system_manager {
#define SYSMGR_FPGAINTF_NAND (1 << 4)
#define SYSMGR_FPGAINTF_SDMMC (1 << 5)
-/* FIXME: This is questionable macro. */
-#define SYSMGR_SDMMC_CTRL_SET(smplsel, drvsel) \
- ((((drvsel) << 0) & 0x7) | (((smplsel) << 3) & 0x38))
+#if defined(CONFIG_TARGET_SOCFPGA_GEN5)
+#define SYSMGR_SDMMC_SMPLSEL_SHIFT 3
+#else
+#define SYSMGR_SDMMC_SMPLSEL_SHIFT 4
+#endif
+
+#define SYSMGR_SDMMC_DRVSEL_SHIFT 0
/* EMAC Group Bit definitions */
#define SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_GMII_MII 0x0