[PATCH 4/6] ARM: Rockchip: Drop rk3xxx_atf_load_bl31()

[Sascha Hauer]

rk3xxx_atf_load_bl31() are exported but only used in atf.c. Drop these
functions and inline the code in rk3xxx_barebox_entry().

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 arch/arm/mach-rockchip/atf.c | 36 ++++++++----------------------------
 include/mach/rockchip/atf.h  | 14 --------------
 2 files changed, 8 insertions(+), 42 deletions(-)

diff --git a/arch/arm/mach-rockchip/atf.c b/arch/arm/mach-rockchip/atf.c
index 37802bfade..4e1b9f6a21 100644
--- a/arch/arm/mach-rockchip/atf.c
+++ b/arch/arm/mach-rockchip/atf.c
@@ -185,12 +185,6 @@ static void rockchip_atf_load_bl31(void *fdt)
 		   barebox_load_address, (uintptr_t)fdt);
 }
 
-void rk3562_atf_load_bl31(void *fdt)
-{
-	ROCKCHIP_GET_ADDRESSES(RK3562, rk3562_bl31_bin, rk3562_bl32_bin);
-	rockchip_atf_load_bl31(fdt);
-}
-
 void __noreturn rk3562_barebox_entry(void *fdt)
 {
 	phys_addr_t memend;
@@ -204,6 +198,7 @@ void __noreturn rk3562_barebox_entry(void *fdt)
 	if (current_el() == 3) {
 		rk3562_lowlevel_init();
 		rockchip_store_bootrom_iram(IOMEM(RK3562_IRAM_BASE));
+		ROCKCHIP_GET_ADDRESSES(RK3562, rk3562_bl31_bin, rk3562_bl32_bin);
 
 		/*
 		 * The downstream TF-A doesn't cope with our device tree when
@@ -216,7 +211,7 @@ void __noreturn rk3562_barebox_entry(void *fdt)
 		 * Pass NULL for now until we have a good reason to pass a real
 		 * device tree.
 		 */
-		rk3562_atf_load_bl31(NULL);
+		rockchip_atf_load_bl31(NULL);
 		/* not reached when CONFIG_ARCH_ROCKCHIP_ATF */
 	}
 
@@ -224,12 +219,6 @@ void __noreturn rk3562_barebox_entry(void *fdt)
 	barebox_arm_entry(membase[0], memsize[0], fdt);
 }
 
-void rk3568_atf_load_bl31(void *fdt)
-{
-	ROCKCHIP_GET_ADDRESSES(RK3568, rk3568_bl31_bin, rk3568_bl32_bin);
-	rockchip_atf_load_bl31(fdt);
-}
-
 void __noreturn rk3568_barebox_entry(void *fdt)
 {
 	phys_addr_t memend;
@@ -243,6 +232,7 @@ void __noreturn rk3568_barebox_entry(void *fdt)
 	if (current_el() == 3) {
 		rk3568_lowlevel_init();
 		rockchip_store_bootrom_iram(IOMEM(RK3568_IRAM_BASE));
+		ROCKCHIP_GET_ADDRESSES(RK3568, rk3568_bl31_bin, rk3568_bl32_bin);
 
 		/*
 		 * The downstream TF-A doesn't cope with our device tree when
@@ -255,7 +245,7 @@ void __noreturn rk3568_barebox_entry(void *fdt)
 		 * Pass NULL for now until we have a good reason to pass a real
 		 * device tree.
 		 */
-		rk3568_atf_load_bl31(NULL);
+		rockchip_atf_load_bl31(NULL);
 		/* not reached when CONFIG_ARCH_ROCKCHIP_ATF */
 	}
 
@@ -263,12 +253,6 @@ void __noreturn rk3568_barebox_entry(void *fdt)
 	barebox_arm_entry(membase[0], memsize[0], fdt);
 }
 
-void rk3588_atf_load_bl31(void *fdt)
-{
-	ROCKCHIP_GET_ADDRESSES(RK3588, rk3588_bl31_bin, rk3588_bl32_bin);
-	rockchip_atf_load_bl31(fdt);
-}
-
 void __noreturn rk3588_barebox_entry(void *fdt)
 {
 	phys_addr_t memend;
@@ -283,6 +267,7 @@ void __noreturn rk3588_barebox_entry(void *fdt)
 	if (current_el() == 3) {
 		rk3588_lowlevel_init();
 		rockchip_store_bootrom_iram(IOMEM(RK3588_IRAM_BASE));
+		ROCKCHIP_GET_ADDRESSES(RK3588, rk3588_bl31_bin, rk3588_bl32_bin);
 
 		if (IS_ENABLED(CONFIG_ARCH_ROCKCHIP_ATF_PASS_FDT)) {
 			pr_debug("Copy fdt to scratch area 0x%p (%zu bytes)\n",
@@ -292,7 +277,7 @@ void __noreturn rk3588_barebox_entry(void *fdt)
 				pr_warn("Failed to create OP-TEE Device tree\n");
 		}
 
-		rk3588_atf_load_bl31(rk_scratch->fdt);
+		rockchip_atf_load_bl31(rk_scratch->fdt);
 		/* not reached when CONFIG_ARCH_ROCKCHIP_ATF */
 	}
 
@@ -300,12 +285,6 @@ void __noreturn rk3588_barebox_entry(void *fdt)
 	barebox_arm_entry(membase[0], memsize[0], fdt);
 }
 
-void rk3576_atf_load_bl31(void *fdt)
-{
-	ROCKCHIP_GET_ADDRESSES(RK3576, rk3576_bl31_bin, rk3576_bl32_bin);
-	rockchip_atf_load_bl31(fdt);
-}
-
 void __noreturn rk3576_barebox_entry(void *fdt)
 {
 	phys_addr_t memend;
@@ -321,6 +300,7 @@ void __noreturn rk3576_barebox_entry(void *fdt)
 
 		rk3576_lowlevel_init();
 		rockchip_store_bootrom_iram(IOMEM(RK3576_IRAM_BASE));
+		ROCKCHIP_GET_ADDRESSES(RK3576, rk3576_bl31_bin, rk3576_bl32_bin);
 
 		if (IS_ENABLED(CONFIG_ARCH_ROCKCHIP_ATF_PASS_FDT)) {
 			pr_debug("Copy fdt to scratch area 0x%p (%zu bytes)\n",
@@ -331,7 +311,7 @@ void __noreturn rk3576_barebox_entry(void *fdt)
 				pr_warn("Failed to copy fdt to scratch: Continue without fdt\n");
 		}
 
-		rk3576_atf_load_bl31(fdt_scratch);
+		rockchip_atf_load_bl31(fdt_scratch);
 		/* not reached when CONFIG_ARCH_ROCKCHIP_ATF */
 	}
 
diff --git a/include/mach/rockchip/atf.h b/include/mach/rockchip/atf.h
index b8627a3598..5454d394a1 100644
--- a/include/mach/rockchip/atf.h
+++ b/include/mach/rockchip/atf.h
@@ -42,20 +42,6 @@
 #define RK3576_BAREBOX_LOAD_ADDRESS	(RK3576_DRAM_BOTTOM + 1024*1024)
 #define RK3588_BAREBOX_LOAD_ADDRESS	(RK3588_DRAM_BOTTOM + 1024*1024)
 
-#ifndef __ASSEMBLY__
-#ifdef CONFIG_ARCH_ROCKCHIP_ATF
-void rk3562_atf_load_bl31(void *fdt);
-void rk3568_atf_load_bl31(void *fdt);
-void rk3576_atf_load_bl31(void *fdt);
-void rk3588_atf_load_bl31(void *fdt);
-#else
-static inline void rk3562_atf_load_bl31(void *fdt) { }
-static inline void rk3568_atf_load_bl31(void *fdt) { }
-static inline void rk3576_atf_load_bl31(void *fdt) { }
-static inline void rk3588_atf_load_bl31(void *fdt) { }
-#endif
-#endif
-
 void __noreturn rk3562_barebox_entry(void *fdt);
 void __noreturn rk3568_barebox_entry(void *fdt);
 void __noreturn rk3576_barebox_entry(void *fdt);

-- 
2.47.3