From: Simon Glass <sjg@chromium.org>
Date: Fri, 24 Oct 2014 00:58:51 +0000 (-0600)
Subject: fdt: Use the correct return types for fdtdec_decode_region()
X-Git-Tag: v2015.01-rc3~56^2~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=76489832b28d158dd341b8992006576584cd204b;p=u-boot

fdt: Use the correct return types for fdtdec_decode_region()

Use the correct FDT data types for this function. Also add more debugging.

Acked-by: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@ti.com>
---

diff --git a/include/fdtdec.h b/include/fdtdec.h
index 4ae77be9ba..099930e7ee 100644
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -595,12 +595,12 @@ const u8 *fdtdec_locate_byte_array(const void *blob, int node,
  * @param blob		FDT blob
  * @param node		node to examine
  * @param prop_name	name of property to find
- * @param ptrp		returns pointer to region, or NULL if no address
- * @param size		returns size of region
- * @return 0 if ok, -1 on error (propery not found)
+ * @param basep		Returns base address of region
+ * @param size		Returns size of region
+ * @return 0 if ok, -1 on error (property not found)
  */
-int fdtdec_decode_region(const void *blob, int node,
-		const char *prop_name, void **ptrp, size_t *size);
+int fdtdec_decode_region(const void *blob, int node, const char *prop_name,
+			 fdt_addr_t *basep, fdt_size_t *sizep);
 
 /* A flash map entry, containing an offset and length */
 struct fmap_entry {
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 9714620ab3..749f66ecc2 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -669,20 +669,25 @@ char *fdtdec_get_config_string(const void *blob, const char *prop_name)
 	return (char *)nodep;
 }
 
-int fdtdec_decode_region(const void *blob, int node,
-		const char *prop_name, void **ptrp, size_t *size)
+int fdtdec_decode_region(const void *blob, int node, const char *prop_name,
+			 fdt_addr_t *basep, fdt_size_t *sizep)
 {
 	const fdt_addr_t *cell;
 	int len;
 
-	debug("%s: %s\n", __func__, prop_name);
+	debug("%s: %s: %s\n", __func__, fdt_get_name(blob, node, NULL),
+	      prop_name);
 	cell = fdt_getprop(blob, node, prop_name, &len);
-	if (!cell || (len != sizeof(fdt_addr_t) * 2))
+	if (!cell || (len < sizeof(fdt_addr_t) * 2)) {
+		debug("cell=%p, len=%d\n", cell, len);
 		return -1;
+	}
+
+	*basep = fdt_addr_to_cpu(*cell);
+	*sizep = fdt_size_to_cpu(cell[1]);
+	debug("%s: base=%08lx, size=%lx\n", __func__, (ulong)*basep,
+	      (ulong)*sizep);
 
-	*ptrp = map_sysmem(fdt_addr_to_cpu(*cell), *size);
-	*size = fdt_size_to_cpu(cell[1]);
-	debug("%s: size=%zx\n", __func__, *size);
 	return 0;
 }