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 CDB91C64EC7 for ; Tue, 28 Feb 2023 21:22:01 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B954B85C3C; Tue, 28 Feb 2023 22:21:59 +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="U3v4sXOQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6294D85C23; Tue, 28 Feb 2023 22:21:58 +0100 (CET) Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) (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 AEC9285C3C for ; Tue, 28 Feb 2023 22:21:55 +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-x536.google.com with SMTP id ee7so45857765edb.2 for ; Tue, 28 Feb 2023 13:21:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1677619315; 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=Q1fMesc7DVDfOFrvzsb2K5jbmW5zpi2iyZi26XUPaOc=; b=U3v4sXOQdfrhpJAeWawsQq64iSpXYSKtEvzwB6Jku1EsqmvZTqw19p2YYLuqaQ4NRC lIfo9yFRiXLS7WsTXM9iu3hVB6qd7npUl1iYJOXpDhYXkJljq7wjyBttgWZ9ajjANWRr A6D0md7u+eq8rCDJoASRIxvwG3uJcKyArbTqDADgYbqlosCs/EnJJnvQRhJRjXLKaYyO 9UEdmlzdNRS1MN/hfyFv/Oa0mm0Yotan0Uzo03OKk8MtmAWH8NbMOaPyJY4DMzoA7UAk /V84C9tFnHXAI942PXPeWXOzvhpi8SQi1b3PT4F8S7mk0fXtfh/tZqKoRzP0dkUHTDoF vPoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677619315; 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=Q1fMesc7DVDfOFrvzsb2K5jbmW5zpi2iyZi26XUPaOc=; b=Oxi987OSeK2zPbJftOycPqLkJW+JdpZfITXenkpXbgSssm9rZSMJD62ltRcYyINeIO v4YJ8PXiw00irMGt3RHNz7vGN/8c6h6l5Uanq1xjecAQtw7h25BGpT4jtDEOKZ+1W1F9 sosLstqVXjolp0HYXlyMdB3Ba45seaO3OP9NN6tIaMhnFeCAQSWg61gxlHn3stJ0Glzh unt/l2h7+8VkrLIaZqMj5OUzTgpNoJn7cXrqNv4Dh0WfVAwqYUu0TzCiMsgzB+t2Ton7 SJ3ww/NuamzQHz9jFJkb8Bf+i7GNy7uPqFKeHmHqvAMa0rCrv+pWj+I8oF4PKbMXqQBg kuSw== X-Gm-Message-State: AO0yUKUNUhTLvwoslc7ImuDC1AQ1cP9uSOqh2wZ12PsuOVjgeSQjoid8 ORbS4goLAOsBH1hqAa+rNZ8= X-Google-Smtp-Source: AK7set9TTq0sKESLyMIUMa5nBX3GFA3CSh/R9gNxtZ3SYSH9FYq0BM2p6FVYw37SVUTmDj/drWcJqA== X-Received: by 2002:a17:906:d158:b0:8b1:2f0e:e3a4 with SMTP id br24-20020a170906d15800b008b12f0ee3a4mr5053446ejb.26.1677619315290; Tue, 28 Feb 2023 13:21:55 -0800 (PST) Received: from [192.168.2.1] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id w23-20020a17090649d700b008b17fe9ac6csm4941043ejv.178.2023.02.28.13.21.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 28 Feb 2023 13:21:54 -0800 (PST) Message-ID: <6db91bfa-b893-a32d-8a5e-016db614c3f3@gmail.com> Date: Tue, 28 Feb 2023 22:21:54 +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 v5 18/21] 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: Content-Language: en-US In-Reply-To: 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.6 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 --- Changed V5: new patch --- doc/develop/driver-model/livetree.rst | 2 +- drivers/clk/at91/sama7g5.c | 2 +- drivers/clk/at91/sckc.c | 2 +- drivers/spi/mtk_snor.c | 2 +- drivers/spi/mtk_spim.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/develop/driver-model/livetree.rst b/doc/develop/driver-model/livetree.rst index e9149d73..07264660 100644 --- a/doc/develop/driver-model/livetree.rst +++ b/doc/develop/driver-model/livetree.rst @@ -94,7 +94,7 @@ For example, the old code may be like this: const void *blob = gd->fdt_blob; int node = dev_of_offset(bus); - i2c_bus->regs = (struct i2c_ctlr *)devfdt_get_addr(dev); + i2c_bus->regs = (struct i2c_ctlr *)devfdt_get_addr_ptr(dev); plat->frequency = fdtdec_get_int(blob, node, "spi-max-frequency", 500000); The new code is: diff --git a/drivers/clk/at91/sama7g5.c b/drivers/clk/at91/sama7g5.c index d1ec3c82..d00016b3 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 = (void __iomem *)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..4a0ae983 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 = (void __iomem *)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..1dc55052 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 = (void __iomem *)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..03275346 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 = (void __iomem *)devfdt_get_addr_ptr(dev); if (!priv->base) return -EINVAL; -- 2.20.1