summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c')
-rw-r--r--arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c35
1 files changed, 10 insertions, 25 deletions
diff --git a/arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c b/arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c
index f79f975080..12c2445287 100644
--- a/arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c
+++ b/arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c
@@ -1,46 +1,31 @@
// SPDX-License-Identifier: GPL-2.0-only
#include <common.h>
-#include <linux/sizes.h>
-#include <asm/barebox-arm-head.h>
#include <asm/barebox-arm.h>
-#include <mach/hardware.h>
-#include <mach/atf.h>
+#include <mach/rockchip/hardware.h>
+#include <mach/rockchip/atf.h>
#include <debug_ll.h>
-#include <mach/rockchip.h>
+#include <mach/rockchip/rockchip.h>
extern char __dtb_rk3568_bpi_r2_pro_start[];
-static noinline void rk3568_start(void)
+ENTRY_FUNCTION(start_rk3568_bpi_r2pro, r0, r1, r2)
{
- void *fdt;
+ putc_ll('>');
/*
* set iodomain vccio6 to 1.8V needed for GMAC1 to work.
* vccio4 (gmac0/switch) needs to stay at 3v3 (default)
+ * FIXME: This is done by the io-domain driver as well, but there
+ * currently is no mechanism to make sure the driver gets probed
+ * before its consumers. Remove this setup once this issue is
+ * resolved.
*/
//set bit 6 in PMU_GRF_IO_VSEL0 for vccio6 1v8
writel(RK_SETBITS(BIT(6)), PMU_GRF_IO_VSEL0);
//clear bit 6 for 3v3 as it was set to 1v8
writel(RK_CLRBITS(BIT(6)), PMU_GRF_IO_VSEL1);
- fdt = __dtb_rk3568_bpi_r2_pro_start;
-
- if (current_el() == 3) {
- rk3568_lowlevel_init();
- rk3568_atf_load_bl31(fdt);
- /* not reached */
- }
-
- barebox_arm_entry(RK3568_DRAM_BOTTOM, 0x80000000 - RK3568_DRAM_BOTTOM, fdt);
-}
-
-ENTRY_FUNCTION(start_rk3568_bpi_r2pro, r0, r1, r2)
-{
- /*
- * Image execution starts at 0x0, but this is used for ATF and
- * OP-TEE later, so move away from here.
- */
if (current_el() == 3)
relocate_to_adr_full(RK3568_BAREBOX_LOAD_ADDRESS);
else
@@ -48,5 +33,5 @@ ENTRY_FUNCTION(start_rk3568_bpi_r2pro, r0, r1, r2)
setup_c();
- rk3568_start();
+ rk3568_barebox_entry(__dtb_rk3568_bpi_r2_pro_start);
}