aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Brugger2019-12-05 18:53:13 +0100
committerMatthias Brugger2019-12-11 10:14:12 +0100
commite19cfcc07ac5da8b3a04e21875ec542d994865d4 (patch)
treea8f39d2a70cfcf9d3a29d5fad1d36f1e3a43f900
parent520f9559020894950d4e962aba52220c8a1d6bfe (diff)
rpi: fix dram bank initialization
To update the dram bank information from device-tree we use fdtdec_decode_ram_size() which expectes the the size-cells and address-cells to be defined in the memory node. For normal system RAM these values are defined in the root node. When the values differ from the default values defined in the spec, we can end up with wrong RAM bank information. Switch to the "standard" way to update the RAM bank information to avoid this. Fixes: 9de5b89e4c ("rpi4: enable dram bank initialization") Signed-off-by: Matthias Brugger <mbrugger@suse.com>
-rw-r--r--board/raspberrypi/rpi/rpi.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index 5f120ea9c28..e19610f40f8 100644
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -275,8 +275,13 @@ int dram_init(void)
#ifdef CONFIG_BCM2711
int dram_init_banksize(void)
{
- return fdtdec_decode_ram_size(gd->fdt_blob, NULL, 0, NULL,
- (phys_size_t *)&gd->ram_size, gd->bd);
+ int ret;
+
+ ret = fdtdec_setup_memory_banksize();
+ if (ret)
+ return ret;
+
+ return fdtdec_setup_mem_size_base();
}
#endif
#endif