Skip to content

Commit 48a5eed

Browse files
committed
Merge tag 'devicetree-fixes-for-6.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fix from Rob Herring: - Revert reserved-memory 'alignment' property to use '#address-cells' instead of '#size-cells'. What's in use trumps the spec. * tag 'devicetree-fixes-for-6.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: Revert "of: reserved-memory: Fix using wrong number of cells to get property 'alignment'"
2 parents 3d25216 + 75f1f31 commit 48a5eed

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/of/of_reserved_mem.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,12 +415,12 @@ static int __init __reserved_mem_alloc_size(unsigned long node, const char *unam
415415

416416
prop = of_get_flat_dt_prop(node, "alignment", &len);
417417
if (prop) {
418-
if (len != dt_root_size_cells * sizeof(__be32)) {
418+
if (len != dt_root_addr_cells * sizeof(__be32)) {
419419
pr_err("invalid alignment property in '%s' node.\n",
420420
uname);
421421
return -EINVAL;
422422
}
423-
align = dt_mem_next_cell(dt_root_size_cells, &prop);
423+
align = dt_mem_next_cell(dt_root_addr_cells, &prop);
424424
}
425425

426426
nomap = of_get_flat_dt_prop(node, "no-map", NULL) != NULL;

0 commit comments

Comments
 (0)