Revert "of: reserved-memory: Fix using wrong number of cells to get property 'alignment'"

commit 75f1f311d883dfaffb98be3c1da208d6ed5d4df9 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
index c7a2fdc6a3e7d629c18d64318197cf1bfdb5a164..6c95bbdf9265a906b71b11622c7dbf6c41ad6504 100644 (file)
--- a/drivers/of/of_reserved_mem.c
+++ b/drivers/of/of_reserved_mem.c
@@ -94,12 +94,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;