From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marek Vasut Date: Wed, 2 Dec 2015 00:30:32 +0100 Subject: [U-Boot] [PATCH] arm: socfpga: fix up a questionable macro for SDMMC In-Reply-To: <1449012047-7763-1-git-send-email-dinguyen@opensource.altera.com> References: <1449012047-7763-1-git-send-email-dinguyen@opensource.altera.com> Message-ID: <201512020030.32516.marex@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Wednesday, December 02, 2015 at 12:20:47 AM, dinguyen at opensource.altera.com wrote: > From: Dinh Nguyen > > Not sure what made this macro questionable, but edit the macro to be > similar to what is used in Linux. It should most likely be dissolved and moved into socfpga_dw_mmc.c , since it's used only once in there. What do you think ? > Signed-off-by: Dinh Nguyen > --- > 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 Best regards, Marek Vasut