From 02224c623d885afb90b00b3a82e6f6697d29699c Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 26 Feb 2018 09:30:59 +0100 Subject: ARM/i.MX53: fix compiler warning The code wants to test if the lower 16bits of the content of MX53_CSD0_BASE_ADDR and SDRAM_COMPARE_CONST1 are identical. The assembly this code was derived from did: mov r5, r0, lsl #16 mov r6, r7, lsl #16 cmp r5, r6 In C this is better written with masks which is better readable and avoid this compiler warning: arch/arm/mach-imx/esdctl-v4.c:613:63: warning: result of '305419896 << 16' requires 46 bits to represent, but 'int' only has 32 bits [-Wshift-overflow=] Signed-off-by: Sascha Hauer --- arch/arm/mach-imx/esdctl-v4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch') diff --git a/arch/arm/mach-imx/esdctl-v4.c b/arch/arm/mach-imx/esdctl-v4.c index 6de4a8d6e7..b32f56d622 100644 --- a/arch/arm/mach-imx/esdctl-v4.c +++ b/arch/arm/mach-imx/esdctl-v4.c @@ -610,7 +610,7 @@ void imx_esdctlv4_init(void) * ok, last possibility is 16b bus on low data-lines, check that * (i.MX25 also suports 16b on high data-lines, but i.MX53 doesn't) */ - if (readl(MX53_CSD0_BASE_ADDR) << 16 == SDRAM_COMPARE_CONST1 << 16) { + if ((readl(MX53_CSD0_BASE_ADDR) & 0xffff) == (SDRAM_COMPARE_CONST1 & 0xffff)) { esdctl0 |= ESDCTL_V4_ESDCTLx_DSIZ_16B_LOW; mask >>= 16; goto sdram_bussize_found; -- cgit v1.2.3