diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index da3cafbd682b..b3b950fc8ea0 100644
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -87,9 +87,9 @@ void __init arm_dt_init_cpu_maps(void)
 		return;
 
 	for_each_child_of_node(cpus, cpu) {
+		const __be32 *cell;
 		int prop_bytes;
 		u32 hwid;
-		const __be32 *cell;
 
 		if (of_node_cmp(cpu->type, "cpu"))
 			continue;
@@ -100,13 +100,14 @@ void __init arm_dt_init_cpu_maps(void)
 		 * properties is considered invalid to build the
 		 * cpu_logical_map.
 		 */
-		cell = of_get_property(cpu, "reg", NULL);
-		if (!cell) {
-			pr_err("%s: missing reg property\n", cpu->full_name);
+		cell = of_get_property(cpu, "reg", &prop_bytes);
+		if (!cell || prop_bytes < sizeof(*cell)) {
+			pr_debug(" * %s missing reg property\n",
+				     cpu->full_name);
 			of_node_put(cpu);
 			return;
 		}
-		hwid = of_read_number(cell, of_n_addr_cells(cpu));
+
 		/*
 		 * Bits n:24 must be set to 0 in the DT since the reg property
 		 * defines the MPIDR[23:0].