tree-wide: use dt_add_property_u64s() where we can

A few places (mostly old code) were using:

	add_property_cells(hi32(number), lo32(number));

This patch converts them to use the helper rather than doing it manually.

Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Reviewed-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>

6 files changed, 7 insertions, 17 deletions

diff --git a/hw/npu.c b/hw/npu.c
index 5232954..302a551 100644
--- a/hw/npu.c
+++ b/hw/npu.c
@@ -1561,8 +1561,7 @@ static void npu_add_phb_properties(struct npu *p)
 			      NPU_NUM_OF_PES);
 	dt_add_property_cells(np, "ibm,opal-reserved-pe",
 			      0);
-        dt_add_property_cells(np, "ibm,opal-tce-kill",
-			      hi32(tkill), lo32(tkill));
+        dt_add_property_u64(np, "ibm,opal-tce-kill", tkill);
 
 	/* Memory window is exposed as 32-bits non-prefetchable
 	 * one because 64-bits prefetchable one is kind of special
diff --git a/hw/nx-rng.c b/hw/nx-rng.c
index f652bb5..dc419cb 100644
--- a/hw/nx-rng.c
+++ b/hw/nx-rng.c
@@ -92,7 +92,6 @@ void nx_create_rng_node(struct dt_node *node)
 		return;
 
 	dt_add_property_strings(rng, "compatible", "ibm,power-rng");
-	dt_add_property_cells(rng, "reg", hi32(rng_addr), lo32(rng_addr),
-			      hi32(rng_len), lo32(rng_len));
+	dt_add_property_u64s(rng, "reg", rng_addr, rng_len);
 	dt_add_property_cells(rng, "ibm,chip-id", gcid);
 }
diff --git a/hw/p7ioc-phb.c b/hw/p7ioc-phb.c
index be0225b..903fbf5 100644
--- a/hw/p7ioc-phb.c
+++ b/hw/p7ioc-phb.c
@@ -2598,10 +2598,8 @@ static void p7ioc_pcie_add_node(struct p7ioc_phb *p)
 
 	/* XXX FIXME: add opal-memwin32, dmawins, etc... */
 	m64b = cleanup_addr(p->m64_base);
-	dt_add_property_cells(np, "ibm,opal-m64-window",
-			      hi32(m64b), lo32(m64b),
-			      hi32(m64b), lo32(m64b),
-			      hi32(PHB_M64_SIZE), lo32(PHB_M64_SIZE));
+	dt_add_property_u64s(np, "ibm,opal-m64-window",
+			      m64b, m64b, PHB_M64_SIZE);
 	dt_add_property_cells(np, "ibm,opal-msi-ports", 256);
 	dt_add_property_cells(np, "ibm,opal-num-pes", 128);
 	dt_add_property_cells(np, "ibm,opal-reserved-pe", 127);
diff --git a/hw/phb3.c b/hw/phb3.c
index feba387..33ceee8 100644
--- a/hw/phb3.c
+++ b/hw/phb3.c
@@ -4386,10 +4386,7 @@ static void phb3_add_properties(struct phb3 *p)
 			      hi32(m32b), lo32(m32b), 0, M32_PCI_SIZE - 0x10000);
 
 	/* XXX FIXME: add opal-memwin32, dmawins, etc... */
-	dt_add_property_cells(np, "ibm,opal-m64-window",
-			      hi32(m64b), lo32(m64b),
-			      hi32(m64b), lo32(m64b),
-			      hi32(m64s), lo32(m64s));
+	dt_add_property_u64s(np, "ibm,opal-m64-window", m64b, m64b, m64s);
 	dt_add_property(np, "ibm,opal-single-pe", NULL, 0);
 	//dt_add_property_cells(np, "ibm,opal-msi-ports", 2048);
 	dt_add_property_cells(np, "ibm,opal-num-pes", 256);
diff --git a/hw/phb4.c b/hw/phb4.c
index f3340a0..b2723ca 100644
--- a/hw/phb4.c
+++ b/hw/phb4.c
@@ -2902,10 +2902,7 @@ static void phb4_add_properties(struct phb4 *p)
 			      hi32(m32b), lo32(m32b), 0, M32_PCI_SIZE - 0x10000);
 
 	/* XXX FIXME: add opal-memwin32, dmawins, etc... */
-	dt_add_property_cells(np, "ibm,opal-m64-window",
-			      hi32(m64b), lo32(m64b),
-			      hi32(m64b), lo32(m64b),
-			      hi32(m64s), lo32(m64s));
+	dt_add_property_u64s(np, "ibm,opal-m64-window", m64b, m64b, m64s);
 	dt_add_property(np, "ibm,opal-single-pe", NULL, 0);
 	dt_add_property_cells(np, "ibm,opal-num-pes", p->num_pes);
 	dt_add_property_cells(np, "ibm,opal-reserved-pe",
diff --git a/hw/psi.c b/hw/psi.c
index 533eabd..8c24ee6 100644
--- a/hw/psi.c
+++ b/hw/psi.c
@@ -869,7 +869,7 @@ static void psi_create_mm_dtnode(struct psi *psi)
 		return;
 
 	/* Hard wire size to 4G */
-	dt_add_property_cells(np, "reg", hi32(addr), lo32(addr), 1, 0);
+	dt_add_property_u64s(np, "reg", addr, 0x100000000ull);
 	switch (proc_gen) {
 	case proc_gen_p7:
 		dt_add_property_strings(np, "compatible", "ibm,psi",