From 897e9179dd9be0295a7ddb36d2e4663e9c7a34c5 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 11 Mar 2025 15:13:19 +0000 Subject: [PATCH] Revert "of: reserved-memory: Fix using wrong number of cells to get property 'alignment'" This reverts commit 0e83ec8c8ef017b03a5250559d3bc65ac639a7d4 which is commit 267b21d0bef8e67dbe6c591c9991444e58237ec9 upstream. It breaks Pixel systems and can be brought back in the future if it's really needed. Change-Id: Ic96fe3259ce2fe4186301e64cfa400057c3dba0e Signed-off-by: Greg Kroah-Hartman --- drivers/of/of_reserved_mem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 285f8d4e2bd1..e89df9b2ad39 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -105,12 +105,12 @@ static int __init __reserved_mem_alloc_size(unsigned long node, 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;