diff mbox series

[2/3] Revert "lib: fdt: Split fdtdec_setup_memory_banksize()"

Message ID e7daf37560b35722a9281b97d78e061b78b21375.1594379807.git.michal.simek@xilinx.com
State Accepted
Commit d4cc6f638c7aa06904e650b1aee735d7d02a30ad
Headers show
Series lib: fdt: Remove two functions from fdtdec.c | expand

Commit Message

Michal Simek July 10, 2020, 11:16 a.m. UTC 
This reverts commit 118f4d4559a4386fa87a1e2509e84a1986b24a34.

There is no user of this split function that's why remove it.

Signed-off-by: Michal Simek <michal.simek at xilinx.com>
---

 include/fdtdec.h | 19 -------------------
 lib/fdtdec.c     | 18 ++++++------------
 2 files changed, 6 insertions(+), 31 deletions(-)

Comments

Simon Glass July 15, 2020, 1:05 a.m. UTC | #1 
On Fri, 10 Jul 2020 at 05:16, Michal Simek <michal.simek at xilinx.com> wrote:
>
> This reverts commit 118f4d4559a4386fa87a1e2509e84a1986b24a34.
>
> There is no user of this split function that's why remove it.
>
> Signed-off-by: Michal Simek <michal.simek at xilinx.com>
> ---
>
>  include/fdtdec.h | 19 -------------------
>  lib/fdtdec.c     | 18 ++++++------------
>  2 files changed, 6 insertions(+), 31 deletions(-)
>

Reviewed-by: Simon Glass <sjg at chromium.org>
diff mbox series

Patch

diff --git a/include/fdtdec.h b/include/fdtdec.h
index abd6d4267194..c9ab822c4428 100644
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -946,25 +946,6 @@  int fdtdec_setup_mem_size_base_fdt(const void *blob);
  */
 int fdtdec_setup_mem_size_base(void);
 
-/**
- * fdtdec_setup_memory_banksize_fdt() - decode and populate gd->bd->bi_dram
- *
- * Decode the /memory 'reg' property to determine the address and size of the
- * memory banks. Use this data to populate the global data board info with the
- * phys address and size of memory banks.
- *
- * This function should be called from a boards dram_init_banksize(). This
- * helper function allows for boards to query the device tree for memory bank
- * information instead of hard coding the information in cases where it cannot
- * be detected automatically.
- *
- * @param blob		FDT blob
- *
- * @return 0 if OK, -EINVAL if the /memory node or reg property is missing or
- * invalid
- */
-int fdtdec_setup_memory_banksize_fdt(const void *blob);
-
 /**
  * fdtdec_setup_memory_banksize() - decode and populate gd->bd->bi_dram
  *
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 0dd7ff1ac3f7..0be41ab72774 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -1065,33 +1065,33 @@  int fdtdec_setup_mem_size_base(void)
 static int get_next_memory_node(const void *blob, int mem)
 {
 	do {
-		mem = fdt_node_offset_by_prop_value(blob, mem,
+		mem = fdt_node_offset_by_prop_value(gd->fdt_blob, mem,
 						    "device_type", "memory", 7);
 	} while (!fdtdec_get_is_enabled(blob, mem));
 
 	return mem;
 }
 
-int fdtdec_setup_memory_banksize_fdt(const void *blob)
+int fdtdec_setup_memory_banksize(void)
 {
 	int bank, ret, mem, reg = 0;
 	struct fdt_resource res;
 
-	mem = get_next_memory_node(blob, -1);
+	mem = get_next_memory_node(gd->fdt_blob, -1);
 	if (mem < 0) {
 		debug("%s: Missing /memory node\n", __func__);
 		return -EINVAL;
 	}
 
 	for (bank = 0; bank < CONFIG_NR_DRAM_BANKS; bank++) {
-		ret = fdt_get_resource(blob, mem, "reg", reg++, &res);
+		ret = fdt_get_resource(gd->fdt_blob, mem, "reg", reg++, &res);
 		if (ret == -FDT_ERR_NOTFOUND) {
 			reg = 0;
-			mem = get_next_memory_node(blob, mem);
+			mem = get_next_memory_node(gd->fdt_blob, mem);
 			if (mem == -FDT_ERR_NOTFOUND)
 				break;
 
-			ret = fdt_get_resource(blob, mem, "reg", reg++, &res);
+			ret = fdt_get_resource(gd->fdt_blob, mem, "reg", reg++, &res);
 			if (ret == -FDT_ERR_NOTFOUND)
 				break;
 		}
@@ -1111,12 +1111,6 @@  int fdtdec_setup_memory_banksize_fdt(const void *blob)
 
 	return 0;
 }
-
-int fdtdec_setup_memory_banksize(void)
-{
-	return fdtdec_setup_memory_banksize_fdt(gd->fdt_blob);
-
-}
 #endif
 
 #if CONFIG_IS_ENABLED(MULTI_DTB_FIT)