Takashi Iwai 1c3c1f
From 2867b9746cef78745c594894aece6f8ef826e0b4 Mon Sep 17 00:00:00 2001
Takashi Iwai 1c3c1f
From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Takashi Iwai 1c3c1f
Date: Sun, 14 Mar 2021 12:07:09 +0100
Takashi Iwai 1c3c1f
Subject: [PATCH] clk: socfpga: fix iomem pointer cast on 64-bit
Takashi Iwai 1c3c1f
Mime-version: 1.0
Takashi Iwai 1c3c1f
Content-type: text/plain; charset=UTF-8
Takashi Iwai 1c3c1f
Content-transfer-encoding: 8bit
Takashi Iwai 1c3c1f
Git-commit: 2867b9746cef78745c594894aece6f8ef826e0b4
Takashi Iwai 1c3c1f
Patch-mainline: v5.12-rc7
Takashi Iwai 1c3c1f
References: git-fixes
Takashi Iwai 1c3c1f
Takashi Iwai 1c3c1f
Pointers should be cast with uintptr_t instead of integer.  This fixes
Takashi Iwai 1c3c1f
warning when compile testing on ARM64:
Takashi Iwai 1c3c1f
Takashi Iwai 1c3c1f
  drivers/clk/socfpga/clk-gate.c: In function ‘socfpga_clk_recalc_rate’:
Takashi Iwai 1c3c1f
  drivers/clk/socfpga/clk-gate.c:102:7: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
Takashi Iwai 1c3c1f
Takashi Iwai 1c3c1f
Fixes: b7cec13f082f ("clk: socfpga: Look for the GPIO_DB_CLK by its offset")
Takashi Iwai 1c3c1f
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Takashi Iwai 1c3c1f
Acked-by: Dinh Nguyen <dinguyen@kernel.org>
Takashi Iwai 1c3c1f
Link: https://lore.kernel.org/r/20210314110709.32599-1-krzysztof.kozlowski@canonical.com
Takashi Iwai 1c3c1f
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Takashi Iwai 1c3c1f
Acked-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai 1c3c1f
Takashi Iwai 1c3c1f
---
Takashi Iwai 1c3c1f
 drivers/clk/socfpga/clk-gate.c | 2 +-
Takashi Iwai 1c3c1f
 1 file changed, 1 insertion(+), 1 deletion(-)
Takashi Iwai 1c3c1f
Takashi Iwai 1c3c1f
diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
Takashi Iwai 1c3c1f
index 43ecd507bf83..cf94a12459ea 100644
Takashi Iwai 1c3c1f
--- a/drivers/clk/socfpga/clk-gate.c
Takashi Iwai 1c3c1f
+++ b/drivers/clk/socfpga/clk-gate.c
Takashi Iwai 1c3c1f
@@ -99,7 +99,7 @@ static unsigned long socfpga_clk_recalc_rate(struct clk_hw *hwclk,
Takashi Iwai 1c3c1f
 		val = readl(socfpgaclk->div_reg) >> socfpgaclk->shift;
Takashi Iwai 1c3c1f
 		val &= GENMASK(socfpgaclk->width - 1, 0);
Takashi Iwai 1c3c1f
 		/* Check for GPIO_DB_CLK by its offset */
Takashi Iwai 1c3c1f
-		if ((int) socfpgaclk->div_reg & SOCFPGA_GPIO_DB_CLK_OFFSET)
Takashi Iwai 1c3c1f
+		if ((uintptr_t) socfpgaclk->div_reg & SOCFPGA_GPIO_DB_CLK_OFFSET)
Takashi Iwai 1c3c1f
 			div = val + 1;
Takashi Iwai 1c3c1f
 		else
Takashi Iwai 1c3c1f
 			div = (1 << val);
Takashi Iwai 1c3c1f
-- 
Takashi Iwai 1c3c1f
2.26.2
Takashi Iwai 1c3c1f