From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9DBA1C6FA99 for ; Fri, 10 Mar 2023 16:46:49 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7DD1185F5F; Fri, 10 Mar 2023 17:46:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CSQ2weOC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E6BA985F77; Fri, 10 Mar 2023 17:46:43 +0100 (CET) Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 419C185F58 for ; Fri, 10 Mar 2023 17:46:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jbx6244@gmail.com Received: by mail-ed1-x52b.google.com with SMTP id k10so22822603edk.13 for ; Fri, 10 Mar 2023 08:46:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678466798; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=Q/L9o49jPeWDASYSvdZiK4LqiM9j46rTZUfmvUYjL6s=; b=CSQ2weOCot/kP0rlQJEmzv5GLU4CCYVQGeGw1QkVMSvUX/0sL7jVuLChN5mVEIDn4D 9/AACVD21L4Xwol+JNBykMW3/4sNRXgxyw+DDkmYQImKI4Iqw7CDJvrOV+8O+tTohRx0 9ZvyYtN1jULmvlfd736unePF4iIaJoc1E/VpyZAvel7FAFy4m0IjMWhNwjPnVoJQwFIA wHthymcm+u7bPFxioOLJ4dWSlu3sKE0+rWYV0W08p9wW/o78XNmB1WU7gHOd9teEcsoO uQGAXkdV2XPqXElMIrJUdSA6DiTm3CuECneiiZefBBF4LQXFIJhYSoJYDt7kRgio04jn Ln/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678466798; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Q/L9o49jPeWDASYSvdZiK4LqiM9j46rTZUfmvUYjL6s=; b=otPGod5abAE3Bdp9/rB2NhHWwOLfGR2uSHROdw7IUtSHfEX5EbDkCb3+I9MrN5qMUs V2rFnWi2gmVaMPyEFlguRHSBSeAAusMkGAaq96XfMQYXwiv2dafgk/dS8ejBX6voGWiY TCgujH8YtIf0r3SuioAEd50hrArrm+QqGyGW8yHxDtDDat3xRxspiJbRZJI7NqgaAkpj h0D5xbhBT06yIMrelvymm5QfyteNCzd6PImb1wJyRN/g4URbNy31OJLwjTtXtfmLlVoG l6/lERUiICy/597HycgE37wuLCwzUD1Gr1WKwtPGPFmp5ztpqak37eesAmwpQLV1Sjbl Eaog== X-Gm-Message-State: AO0yUKVja9YoqKog/f1YackswB3L0x2NeBFcogzLKxzlMg4pKJNkKtC+ sHv1Gq/pT0wR1lz6dB0zZdoY+YofPIo= X-Google-Smtp-Source: AK7set8nzQvPDhHVQZHZglbHXtI/y07NwtEVBhV1xkLor4blLw5tdvlM0nOm32GTFyeBInQmSbq24w== X-Received: by 2002:a17:907:9c04:b0:8a5:8620:575 with SMTP id ld4-20020a1709079c0400b008a586200575mr26683435ejc.3.1678466797804; Fri, 10 Mar 2023 08:46:37 -0800 (PST) Received: from [192.168.2.2] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id b22-20020a50ccd6000000b004eb16b75b93sm224871edj.49.2023.03.10.08.46.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 10 Mar 2023 08:46:37 -0800 (PST) Message-ID: <0401a8d5-aa7c-a213-226c-c453a07cedda@gmail.com> Date: Fri, 10 Mar 2023 17:46:36 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 From: Johan Jonker Subject: [PATCH v7 20/23] drivers: use devfdt_get_addr_ptr when cast to pointer To: dario.binacchi@amarulasolutions.com, michael@amarulasolutions.com, sjg@chromium.org, philipp.tomsich@vrull.eu, kever.yang@rock-chips.com Cc: u-boot@lists.denx.de, yifeng.zhao@rock-chips.com References: <4caa17bc-6d32-5b07-68f3-f5ced40bfcbb@gmail.com> Content-Language: en-US In-Reply-To: <4caa17bc-6d32-5b07-68f3-f5ced40bfcbb@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The fdt_addr_t and phys_addr_t size have been decoupled. A 32bit CPU can expect 64-bit data from the device tree parser, so use devfdt_get_addr_ptr instead of the devfdt_get_addr function in the various files in the drivers directory that cast to a pointer. Signed-off-by: Johan Jonker Reviewed-by: Simon Glass --- Changed V6: drop cast skip livetree.rst Changed V5: new patch --- drivers/clk/at91/sama7g5.c | 2 +- drivers/clk/at91/sckc.c | 2 +- drivers/spi/mtk_snor.c | 2 +- drivers/spi/mtk_spim.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/clk/at91/sama7g5.c b/drivers/clk/at91/sama7g5.c index d1ec3c82..7a5a2906 100644 --- a/drivers/clk/at91/sama7g5.c +++ b/drivers/clk/at91/sama7g5.c @@ -1114,7 +1114,7 @@ static const struct pmc_clk_setup { static int sama7g5_clk_probe(struct udevice *dev) { - void __iomem *base = (void *)devfdt_get_addr(dev); + void __iomem *base = devfdt_get_addr_ptr(dev); unsigned int *clkmuxallocs[SAMA7G5_MAX_MUX_ALLOCS]; unsigned int *muxallocs[SAMA7G5_MAX_MUX_ALLOCS]; const char *p[10]; diff --git a/drivers/clk/at91/sckc.c b/drivers/clk/at91/sckc.c index 34ce611a..43136ab2 100644 --- a/drivers/clk/at91/sckc.c +++ b/drivers/clk/at91/sckc.c @@ -123,7 +123,7 @@ U_BOOT_DRIVER(at91_sam9x60_td_slck) = { static int at91_sam9x60_sckc_probe(struct udevice *dev) { struct sam9x60_sckc *sckc = dev_get_priv(dev); - void __iomem *base = (void *)devfdt_get_addr(dev); + void __iomem *base = devfdt_get_addr_ptr(dev); const char *slow_rc_osc, *slow_osc; const char *parents[2]; struct clk *clk, c; diff --git a/drivers/spi/mtk_snor.c b/drivers/spi/mtk_snor.c index 04f588a7..4b7d4a6e 100644 --- a/drivers/spi/mtk_snor.c +++ b/drivers/spi/mtk_snor.c @@ -470,7 +470,7 @@ static int mtk_snor_probe(struct udevice *bus) int ret; u32 reg; - priv->base = (void __iomem *)devfdt_get_addr(bus); + priv->base = devfdt_get_addr_ptr(bus); if (!priv->base) return -EINVAL; diff --git a/drivers/spi/mtk_spim.c b/drivers/spi/mtk_spim.c index a7c0fc59..ebb8ee8e 100644 --- a/drivers/spi/mtk_spim.c +++ b/drivers/spi/mtk_spim.c @@ -641,7 +641,7 @@ static int mtk_spim_probe(struct udevice *dev) struct mtk_spim_priv *priv = dev_get_priv(dev); int ret; - priv->base = (void __iomem *)devfdt_get_addr(dev); + priv->base = devfdt_get_addr_ptr(dev); if (!priv->base) return -EINVAL; -- 2.20.1