[PATCH v4 1/7 fixup] drivers: of: add initialization code for reserved memory (fixup)
Marek Szyprowski
m.szyprowski at samsung.com
Thu Feb 20 07:40:08 EST 2014
Rename 'align' property to 'alignment' to match documentation.
Signed-off-by: Marek Szyprowski <m.szyprowski at samsung.com>
---
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 cacf04810b87..49cf430a9e2a 100644
--- a/drivers/of/of_reserved_mem.c
+++ b/drivers/of/of_reserved_mem.c
@@ -112,10 +112,10 @@ __reserved_mem_alloc_size(unsigned long node, const char *uname,
nomap = of_get_flat_dt_prop(node, "no-map", NULL) != NULL;
- prop = of_get_flat_dt_prop(node, "align", &len);
+ prop = of_get_flat_dt_prop(node, "alignment", &len);
if (prop) {
if (len != dt_root_addr_cells * sizeof(__be32)) {
- pr_err("Reserved memory: invalid align property in '%s' node.\n",
+ pr_err("Reserved memory: invalid alignment property in '%s' node.\n",
uname);
return -EINVAL;
}
--
1.7.9.5
More information about the linux-arm-kernel
mailing list