summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAhmad Fatoum <a.fatoum@pengutronix.de>2022-08-15 13:42:46 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2022-08-16 10:18:27 +0200
commitbedfdfa92ff13601cdc8f5101fc206a345fec279 (patch)
tree5ec33e42b74771710276da90967a9354ae9cb4a0 /fs
parentad05e170f6d1d40137c87c48d5f1a04cbf56ce50 (diff)
downloadbarebox-bedfdfa92ff13601cdc8f5101fc206a345fec279.tar.gz
barebox-bedfdfa92ff13601cdc8f5101fc206a345fec279.tar.xz
pstore: ram: use new of_fixup_reserved_memory() helper
The new of_fixup_reserved_memory() can handle everything that the opencoded version in pstore can with the added benefit that it correctly handles #address-cells/#size-cells != 1, which previously were just assumed to be 1. Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Link: https://lore.barebox.org/20220815114246.2275465-2-a.fatoum@pengutronix.de Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'fs')
-rw-r--r--fs/pstore/ram.c33
1 files changed, 10 insertions, 23 deletions
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index b484ecd552..29585bff59 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -474,37 +474,24 @@ static int ramoops_of_fixup(struct device_node *root, void *data)
{
struct ramoops_platform_data *pdata = data;
struct device_node *node;
- u32 reg[2];
+ struct resource res = {};
int ret;
- node = of_get_child_by_name(root, "reserved-memory");
- if (!node) {
- pr_info("Adding reserved-memory node\n");
- node = of_create_node(root, "/reserved-memory");
- if (!node)
- return -ENOMEM;
+ res.start = pdata->mem_address;
+ res.end = res.start + pdata->mem_size;
+ res.name = "ramoops";
- of_property_write_u32(node, "#address-cells", 1);
- of_property_write_u32(node, "#size-cells", 1);
- of_new_property(node, "ranges", NULL, 0);
- }
+ ret = of_fixup_reserved_memory(root, &res);
+ if (ret)
+ return ret;
- node = of_get_child_by_name(node, "ramoops");
- if (!node) {
- pr_info("Adding ramoops node\n");
- node = of_create_node(root, "/reserved-memory/ramoops");
- if (!node)
- return -ENOMEM;
- }
+ node = of_find_node_by_path_from(root, "/reserved-memory/ramoops");
+ if (!node)
+ return -ENOMEM;
ret = of_property_write_string(node, "compatible", "ramoops");
if (ret)
return ret;
- reg[0] = pdata->mem_address;
- reg[1] = pdata->mem_size;
- ret = of_property_write_u32_array(node, "reg", reg, 2);
- if (ret)
- return ret;
ret = of_property_write_bool(node, "unbuffered", pdata->mem_type);
if (ret)