[U-Boot] [PATCH] arm: socfpga: fix up a questionable macro for SDMMC

dinguyen at opensource.altera.com dinguyen at opensource.altera.com
Wed Dec 2 00:20:47 CET 2015


From: Dinh Nguyen <dinguyen at opensource.altera.com>

Not sure what made this macro questionable, but edit the macro to be similar
to what is used in Linux.

Signed-off-by: Dinh Nguyen <dinguyen at opensource.altera.com>
---
 arch/arm/mach-socfpga/include/mach/system_manager.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm/mach-socfpga/include/mach/system_manager.h b/arch/arm/mach-socfpga/include/mach/system_manager.h
index 618c92f..c0566b0 100644
--- a/arch/arm/mach-socfpga/include/mach/system_manager.h
+++ b/arch/arm/mach-socfpga/include/mach/system_manager.h
@@ -201,9 +201,8 @@ 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))
+	((((smplsel) & 0x7) << 3) | (((drvsel) & 0x7) << 0))
 
 /* EMAC Group Bit definitions */
 #define SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_GMII_MII	0x0
-- 
2.6.2



More information about the U-Boot mailing list