sunxi: Silence warning about non-static inline function

[oweals/u-boot.git] / arch / arm / mach-zynqmp / cpu.c

diff --git a/arch/arm/mach-zynqmp/cpu.c b/arch/arm/mach-zynqmp/cpu.c
index 8a2677b8a9b80488acf526bb9d9a42a8c91f8a47..3eb8e8f44875176ab7ce43f3dcf9a5f7560909f1 100644 (file)
--- a/arch/arm/mach-zynqmp/cpu.c
+++ b/arch/arm/mach-zynqmp/cpu.c
@@ -5,11 +5,15 @@
  */
 
 #include <common.h>
+#include <init.h>
+#include <time.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/armv8/mmu.h>
+#include <asm/cache.h>
 #include <asm/io.h>
 #include <zynqmp_firmware.h>
+#include <asm/cache.h>
 
 #define ZYNQ_SILICON_VER_MASK  0xF000
 #define ZYNQ_SILICON_VER_SHIFT 12
@@ -115,7 +119,7 @@ void tcm_init(u8 mode)
 #endif
 
 #ifdef CONFIG_SYS_MEM_RSVD_FOR_MMU
-int reserve_mmu(void)
+int arm_reserve_mmu(void)
 {
        tcm_init(TCM_LOCK);
        gd->arch.tlb_size = PGTABLE_SIZE;
@@ -151,9 +155,6 @@ unsigned int zynqmp_get_silicon_version(void)
        return ZYNQMP_CSU_VERSION_SILICON;
 }
 
-#define ZYNQMP_MMIO_READ       0xC2000014
-#define ZYNQMP_MMIO_WRITE      0xC2000013
-
 static int zynqmp_mmio_rawwrite(const u32 address,
                      const u32 mask,
                      const u32 value)
@@ -187,8 +188,8 @@ int zynqmp_mmio_write(const u32 address,
                return zynqmp_mmio_rawwrite(address, mask, value);
 #if defined(CONFIG_ZYNQMP_FIRMWARE)
        else
-               return invoke_smc(ZYNQMP_MMIO_WRITE, address, mask,
-                                 value, 0, NULL);
+               return xilinx_pm_request(PM_MMIO_WRITE, address, mask,
+                                        value, 0, NULL);
 #endif
 
        return -EINVAL;
@@ -208,8 +209,8 @@ int zynqmp_mmio_read(const u32 address, u32 *value)
        else {
                u32 ret_payload[PAYLOAD_ARG_CNT];
 
-               ret = invoke_smc(ZYNQMP_MMIO_READ, address, 0, 0,
-                                0, ret_payload);
+               ret = xilinx_pm_request(PM_MMIO_READ, address, 0, 0,
+                                       0, ret_payload);
                *value = ret_payload[1];
        }
 #endif