lib: fdt: Split fdtdec_setup_memory_banksize()
Split fdtdec_setup_memory_banksize() into fdtdec_setup_memory_banksize_fdt(), which allows the caller to pass custom blob into the function and the original fdtdec_setup_memory_banksize(), which uses the gd->fdt_blob. This is useful when configuring the DRAM properties from a FDT blob fragment passed in by the firmware. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Cc: Simon Glass <sjg@chromium.org> Cc: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
3ebe09d09a
commit
118f4d4559
@ -955,6 +955,25 @@ 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
|
||||
*
|
||||
|
18
lib/fdtdec.c
18
lib/fdtdec.c
@ -1123,33 +1123,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(gd->fdt_blob, mem,
|
||||
mem = fdt_node_offset_by_prop_value(blob, mem,
|
||||
"device_type", "memory", 7);
|
||||
} while (!fdtdec_get_is_enabled(blob, mem));
|
||||
|
||||
return mem;
|
||||
}
|
||||
|
||||
int fdtdec_setup_memory_banksize(void)
|
||||
int fdtdec_setup_memory_banksize_fdt(const void *blob)
|
||||
{
|
||||
int bank, ret, mem, reg = 0;
|
||||
struct fdt_resource res;
|
||||
|
||||
mem = get_next_memory_node(gd->fdt_blob, -1);
|
||||
mem = get_next_memory_node(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(gd->fdt_blob, mem, "reg", reg++, &res);
|
||||
ret = fdt_get_resource(blob, mem, "reg", reg++, &res);
|
||||
if (ret == -FDT_ERR_NOTFOUND) {
|
||||
reg = 0;
|
||||
mem = get_next_memory_node(gd->fdt_blob, mem);
|
||||
mem = get_next_memory_node(blob, mem);
|
||||
if (mem == -FDT_ERR_NOTFOUND)
|
||||
break;
|
||||
|
||||
ret = fdt_get_resource(gd->fdt_blob, mem, "reg", reg++, &res);
|
||||
ret = fdt_get_resource(blob, mem, "reg", reg++, &res);
|
||||
if (ret == -FDT_ERR_NOTFOUND)
|
||||
break;
|
||||
}
|
||||
@ -1169,6 +1169,12 @@ int fdtdec_setup_memory_banksize(void)
|
||||
|
||||
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)
|
||||
|
Loading…
Reference in New Issue
Block a user