aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorOvidiu Panait2022-01-01 19:13:28 +0200
committerTom Rini2022-01-18 08:31:02 -0500
commit1b212bb9f4bf55f58ed230a444e51204f1fa8b02 (patch)
treed3bdb1340154c1ca56769db037eb58704c54a028 /arch/arm
parent78fc0395c01640df0fa9b8be736bf855a0416b56 (diff)
common: board_r: drop initr_addr_map wrapper
Add a return value to init_addr_map and use it directly in the post-relocation init sequence, rather than using a wrapper stub. Reviewed-by: Matthias Brugger <mbrugger@suse.com> Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/include/asm/mmu.h2
-rw-r--r--arch/arm/mach-bcm283x/init.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/include/asm/mmu.h b/arch/arm/include/asm/mmu.h
index 9ac16f599e9..8449720fadb 100644
--- a/arch/arm/include/asm/mmu.h
+++ b/arch/arm/include/asm/mmu.h
@@ -3,6 +3,6 @@
#ifndef __ASM_ARM_MMU_H
#define __ASM_ARM_MMU_H
-void init_addr_map(void);
+int init_addr_map(void);
#endif
diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c
index 98034999852..183650a90a8 100644
--- a/arch/arm/mach-bcm283x/init.c
+++ b/arch/arm/mach-bcm283x/init.c
@@ -152,7 +152,7 @@ int mach_cpu_init(void)
#include <addr_map.h>
#include <asm/system.h>
-void init_addr_map(void)
+int init_addr_map(void)
{
mmu_set_region_dcache_behaviour_phys(BCM2711_RPI4_PCIE_XHCI_MMIO_VIRT,
BCM2711_RPI4_PCIE_XHCI_MMIO_PHYS,
@@ -165,6 +165,8 @@ void init_addr_map(void)
addrmap_set_entry(BCM2711_RPI4_PCIE_XHCI_MMIO_VIRT,
BCM2711_RPI4_PCIE_XHCI_MMIO_PHYS,
BCM2711_RPI4_PCIE_XHCI_MMIO_SIZE, 1);
+
+ return 0;
}
#endif