diff options
| author | Tom Rini <trini@konsulko.com> | 2015-12-19 22:05:31 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-12-19 22:05:31 -0500 |
| commit | 34059d8f502dec034af2387c7d00a56ccab99a9e (patch) | |
| tree | 0227cccae15473da34e95acf35140ef8be3f4643 /arch/arm/mach-socfpga/include/mach/system_manager.h | |
| parent | 1c0e84ca829a09948a61107744402296566aa076 (diff) | |
| parent | 48275c96ff4deaeca10d9e18c78f6a1e3653efa2 (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-socfpga
Diffstat (limited to 'arch/arm/mach-socfpga/include/mach/system_manager.h')
| -rw-r--r-- | arch/arm/mach-socfpga/include/mach/system_manager.h | 10 |
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 8712f8ea11..c45edea32d 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 |