Commit 48a5eed9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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'"
parents 3d252160 75f1f311

drivers/of/of_reserved_mem.c

+2 −2
Original line number Diff line number Diff line
@@ -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;