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 10/21] core: remap: convert regmap_init_mem_plat() input to phys_addr_t
Date: Tue, 28 Feb 2023 22:18:39 +0100 [thread overview]
Message-ID: <335be9d1-e564-300a-8514-90d346ed2c75@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 convert regmap_init_mem_plat() input to phys_addr_t in files
that use this function. Also correct struct syscon_base_plat
depending on CONFIG_PHYS_64BIT setting and fix ARRAY_SIZE
divider.
Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
---
drivers/core/regmap.c | 2 +-
drivers/core/syscon-uclass.c | 4 ++--
drivers/ram/rockchip/sdram_rk3066.c | 2 +-
drivers/ram/rockchip/sdram_rk3188.c | 2 +-
drivers/ram/rockchip/sdram_rk322x.c | 2 +-
drivers/ram/rockchip/sdram_rk3288.c | 2 +-
drivers/ram/rockchip/sdram_rk3328.c | 2 +-
drivers/ram/rockchip/sdram_rk3399.c | 2 +-
include/regmap.h | 2 +-
include/syscon.h | 13 +++++++------
10 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/drivers/core/regmap.c b/drivers/core/regmap.c
index e33bb9d7..37da64b2 100644
--- a/drivers/core/regmap.c
+++ b/drivers/core/regmap.c
@@ -79,7 +79,7 @@ static struct regmap *regmap_alloc(int count)
}
#if CONFIG_IS_ENABLED(OF_PLATDATA)
-int regmap_init_mem_plat(struct udevice *dev, fdt_val_t *reg, int count,
+int regmap_init_mem_plat(struct udevice *dev, phys_addr_t *reg, int count,
struct regmap **mapp)
{
struct regmap_range *range;
diff --git a/drivers/core/syscon-uclass.c b/drivers/core/syscon-uclass.c
index 25fdb66e..b557a24f 100644
--- a/drivers/core/syscon-uclass.c
+++ b/drivers/core/syscon-uclass.c
@@ -58,8 +58,8 @@ static int syscon_pre_probe(struct udevice *dev)
#if CONFIG_IS_ENABLED(OF_PLATDATA)
struct syscon_base_plat *plat = dev_get_plat(dev);
- return regmap_init_mem_plat(dev, plat->reg, ARRAY_SIZE(plat->reg),
- &priv->regmap);
+ return regmap_init_mem_plat(dev, (phys_addr_t *)plat->reg,
+ ARRAY_SIZE(plat->reg) / 2, &priv->regmap);
#else
return regmap_init_mem(dev_ofnode(dev), &priv->regmap);
#endif
diff --git a/drivers/ram/rockchip/sdram_rk3066.c b/drivers/ram/rockchip/sdram_rk3066.c
index a2425f22..9bb26b64 100644
--- a/drivers/ram/rockchip/sdram_rk3066.c
+++ b/drivers/ram/rockchip/sdram_rk3066.c
@@ -801,7 +801,7 @@ static int rk3066_dmc_conv_of_plat(struct udevice *dev)
memcpy(&plat->base, of_plat->rockchip_sdram_params, sizeof(plat->base));
/* RK3066 supports dual-channel, set default channel num to 2. */
plat->num_channels = 1;
- ret = regmap_init_mem_plat(dev, of_plat->reg,
+ ret = regmap_init_mem_plat(dev, (phys_addr_t *)of_plat->reg,
ARRAY_SIZE(of_plat->reg) / 2, &plat->map);
if (ret)
return ret;
diff --git a/drivers/ram/rockchip/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c
index 272b1b2d..1838985c 100644
--- a/drivers/ram/rockchip/sdram_rk3188.c
+++ b/drivers/ram/rockchip/sdram_rk3188.c
@@ -867,7 +867,7 @@ static int conv_of_plat(struct udevice *dev)
memcpy(&plat->base, of_plat->rockchip_sdram_params, sizeof(plat->base));
/* rk3188 supports dual-channel, set default channel num to 2 */
plat->num_channels = 1;
- ret = regmap_init_mem_plat(dev, of_plat->reg,
+ ret = regmap_init_mem_plat(dev, (phys_addr_t *)of_plat->reg,
ARRAY_SIZE(of_plat->reg) / 2, &plat->map);
if (ret)
return ret;
diff --git a/drivers/ram/rockchip/sdram_rk322x.c b/drivers/ram/rockchip/sdram_rk322x.c
index 1b204fb5..33599dc5 100644
--- a/drivers/ram/rockchip/sdram_rk322x.c
+++ b/drivers/ram/rockchip/sdram_rk322x.c
@@ -769,7 +769,7 @@ static int conv_of_plat(struct udevice *dev)
memcpy(&plat->base, of_plat->rockchip_sdram_params, sizeof(plat->base));
plat->num_channels = 1;
- ret = regmap_init_mem_plat(dev, of_plat->reg,
+ ret = regmap_init_mem_plat(dev, (phys_addr_t *)of_plat->reg,
ARRAY_SIZE(of_plat->reg) / 2, &plat->map);
if (ret)
return ret;
diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c
index 83778ad1..1a548da5 100644
--- a/drivers/ram/rockchip/sdram_rk3288.c
+++ b/drivers/ram/rockchip/sdram_rk3288.c
@@ -1029,7 +1029,7 @@ static int conv_of_plat(struct udevice *dev)
memcpy(&plat->base, of_plat->rockchip_sdram_params, sizeof(plat->base));
/* Rk3288 supports dual-channel, set default channel num to 2 */
plat->num_channels = 2;
- ret = regmap_init_mem_plat(dev, of_plat->reg,
+ ret = regmap_init_mem_plat(dev, (phys_addr_t *)of_plat->reg,
ARRAY_SIZE(of_plat->reg) / 2, &plat->map);
if (ret)
return ret;
diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c
index 184c93f7..41da7ca2 100644
--- a/drivers/ram/rockchip/sdram_rk3328.c
+++ b/drivers/ram/rockchip/sdram_rk3328.c
@@ -54,7 +54,7 @@ static int conv_of_plat(struct udevice *dev)
struct dtd_rockchip_rk3328_dmc *dtplat = &plat->dtplat;
int ret;
- ret = regmap_init_mem_plat(dev, dtplat->reg,
+ ret = regmap_init_mem_plat(dev, (phys_addr_t *)dtplat->reg,
ARRAY_SIZE(dtplat->reg) / 2, &plat->map);
if (ret)
return ret;
diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
index b1fea04e..e3f76fa4 100644
--- a/drivers/ram/rockchip/sdram_rk3399.c
+++ b/drivers/ram/rockchip/sdram_rk3399.c
@@ -3048,7 +3048,7 @@ static int conv_of_plat(struct udevice *dev)
struct dtd_rockchip_rk3399_dmc *dtplat = &plat->dtplat;
int ret;
- ret = regmap_init_mem_plat(dev, dtplat->reg,
+ ret = regmap_init_mem_plat(dev, (phys_addr_t *)dtplat->reg,
ARRAY_SIZE(dtplat->reg) / 2, &plat->map);
if (ret)
return ret;
diff --git a/include/regmap.h b/include/regmap.h
index e81a3602..a274fb27 100644
--- a/include/regmap.h
+++ b/include/regmap.h
@@ -388,7 +388,7 @@ int regmap_init_mem(ofnode node, struct regmap **mapp);
* Use regmap_uninit() to free it.
*
*/
-int regmap_init_mem_plat(struct udevice *dev, fdt_val_t *reg, int count,
+int regmap_init_mem_plat(struct udevice *dev, phys_addr_t *reg, int count,
struct regmap **mapp);
int regmap_init_mem_index(ofnode node, struct regmap **mapp, int index);
diff --git a/include/syscon.h b/include/syscon.h
index f5e6cc1a..836ae07c 100644
--- a/include/syscon.h
+++ b/include/syscon.h
@@ -27,14 +27,15 @@ struct syscon_ops {
#if CONFIG_IS_ENABLED(OF_PLATDATA)
/*
- * We don't support 64-bit machines. If they are so resource-contrained that
- * they need to use OF_PLATDATA, something is horribly wrong with the
- * education of our hardware engineers.
- *
- * Update: 64-bit is now supported and we have an education crisis.
+ * Support for 64bit or 32bit fdt addresses
+ * depending on the physical SoC properties.
*/
struct syscon_base_plat {
- fdt_val_t reg[2];
+#ifdef CONFIG_PHYS_64BIT
+ fdt64_t reg[2];
+#else
+ fdt32_t reg[2];
+#endif
};
#endif
--
2.20.1
next prev parent reply other threads:[~2023-02-28 21:19 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 ` Johan Jonker [this message]
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 ` [PATCH v5 18/21] drivers: use devfdt_get_addr_ptr " Johan Jonker
2023-03-01 15:01 ` 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=335be9d1-e564-300a-8514-90d346ed2c75@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