From: Johan Jonker <jbx6244@gmail.com>
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
Subject: [PATCH v5 18/21] drivers: use devfdt_get_addr_ptr when cast to pointer
Date: Tue, 28 Feb 2023 22:21:54 +0100 [thread overview]
Message-ID: <6db91bfa-b893-a32d-8a5e-016db614c3f3@gmail.com> (raw)
In-Reply-To: <d70fb562-db1f-2a6d-206e-55568176c228@gmail.com>
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 <jbx6244@gmail.com>
---
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
next prev parent reply other threads:[~2023-02-28 21:22 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-28 21:10 [PATCH v5 00/21] Fixes for Rockchip NFC driver part 1 Johan Jonker
2023-02-28 21:14 ` [PATCH v5 01/21] mtd: nand: raw: rockchip_nfc: use dev_read_addr_ptr Johan Jonker
2023-02-28 21:15 ` [PATCH v5 02/21] mtd: nand: raw: rockchip_nfc: remove the compatible string "rockchip,rk3308-nfc" Johan Jonker
2023-02-28 21:16 ` [PATCH v5 03/21] mtd: nand: raw: rockchip_nfc: add layout structure Johan Jonker
2023-02-28 21:16 ` [PATCH v5 04/21] mtd: nand: raw: rockchip_nfc: add flash_node to chip structure Johan Jonker
2023-02-28 21:16 ` [PATCH v5 05/21] mtd: nand: raw: rockchip_nfc: fix oobfree offset and description Johan Jonker
2023-02-28 21:17 ` [PATCH v5 06/21] mtd: nand: add support for the Sandisk SDTNQGAMA chip Johan Jonker
2023-02-28 21:17 ` [PATCH v5 07/21] rockchip: adc: rockchip-saradc: use dev_read_addr_ptr Johan Jonker
2023-02-28 21:18 ` [PATCH v5 08/21] rockchip: timer: dw-apb-timer: convert dev_read_addr output to phys_addr_t Johan Jonker
2023-02-28 21:18 ` [PATCH v5 09/21] include: dm: ofnode: fix headers Johan Jonker
2023-02-28 21:18 ` [PATCH v5 10/21] core: remap: convert regmap_init_mem_plat() input to phys_addr_t Johan Jonker
2023-02-28 21:19 ` [PATCH v5 11/21] core: fdtaddr: add devfdt_get_addr_size_index_ptr function Johan Jonker
2023-02-28 21:20 ` [PATCH v5 12/21] core: read: add dev_read_addr_index_ptr function Johan Jonker
2023-03-01 15:01 ` Simon Glass
2023-02-28 21:20 ` [PATCH v5 13/21] spi: spi-aspeed-smc: use devfdt_get_addr_index_ptr Johan Jonker
2023-03-01 15:01 ` Simon Glass
2023-02-28 21:20 ` [PATCH v5 14/21] drivers: use dev_read_addr_index_ptr when cast to pointer Johan Jonker
2023-02-28 21:21 ` [PATCH v5 15/21] drivers: use dev_read_addr_ptr " Johan Jonker
2023-03-01 15:01 ` Simon Glass
2023-02-28 21:21 ` [PATCH v5 16/21] drivers: use devfdt_get_addr_size_index_ptr " Johan Jonker
2023-02-28 21:21 ` [PATCH v5 17/21] drivers: use devfdt_get_addr_index_ptr " Johan Jonker
2023-03-01 15:01 ` Simon Glass
2023-02-28 21:21 ` Johan Jonker [this message]
2023-03-01 15:01 ` [PATCH v5 18/21] drivers: use devfdt_get_addr_ptr " Simon Glass
2023-02-28 21:22 ` [PATCH v5 19/21] drivers: fix debug string with fdt_addr_t input Johan Jonker
2023-03-01 15:01 ` Simon Glass
2023-02-28 21:22 ` [PATCH v5 20/21] arm: stm32mp: spl: fix function " Johan Jonker
2023-02-28 21:22 ` [PATCH v5 21/21] include: fdtdec: decouple fdt_addr_t and phys_addr_t size Johan Jonker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6db91bfa-b893-a32d-8a5e-016db614c3f3@gmail.com \
--to=jbx6244@gmail.com \
--cc=dario.binacchi@amarulasolutions.com \
--cc=kever.yang@rock-chips.com \
--cc=michael@amarulasolutions.com \
--cc=philipp.tomsich@vrull.eu \
--cc=sjg@chromium.org \
--cc=u-boot@lists.denx.de \
--cc=yifeng.zhao@rock-chips.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox