diff options
| author | Rob Herring (Arm) <robh@kernel.org> | 2025-02-26 22:38:19 +0300 |
|---|---|---|
| committer | Rob Herring (Arm) <robh@kernel.org> | 2025-02-26 22:39:28 +0300 |
| commit | 75f1f311d883dfaffb98be3c1da208d6ed5d4df9 (patch) | |
| tree | 6e0c1bdb386f4cec55acf72f1a7ccefb8103f1d7 | |
| parent | 038e33fcd40e59b60cdca561c2a39998e6759e08 (diff) | |
| download | linux-75f1f311d883dfaffb98be3c1da208d6ed5d4df9.tar.xz | |
Revert "of: reserved-memory: Fix using wrong number of cells to get property 'alignment'"
This reverts commit 267b21d0bef8e67dbe6c591c9991444e58237ec9.
Turns out some DTs do depend on this behavior. Specifically, a
downstream Pixel 6 DT. Revert the change at least until we can decide if
the DT spec can be changed instead.
Cc: stable@vger.kernel.org
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
| -rw-r--r-- | drivers/of/of_reserved_mem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 75e819f66a56..ee2e31522d7e 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -415,12 +415,12 @@ static int __init __reserved_mem_alloc_size(unsigned long node, const char *unam prop = of_get_flat_dt_prop(node, "alignment", &len); if (prop) { - if (len != dt_root_size_cells * sizeof(__be32)) { + if (len != dt_root_addr_cells * sizeof(__be32)) { pr_err("invalid alignment property in '%s' node.\n", uname); return -EINVAL; } - align = dt_mem_next_cell(dt_root_size_cells, &prop); + align = dt_mem_next_cell(dt_root_addr_cells, &prop); } nomap = of_get_flat_dt_prop(node, "no-map", NULL) != NULL; |