aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMichal Simek2019-10-04 15:35:45 +0200
committerMichal Simek2019-10-24 13:37:01 +0200
commit403619515e81bde2d0f1a76ca472fbf8b88572e8 (patch)
treea3e6fffc3747846bad027fe19d240c8c582c3981 /arch
parent6596270ecb5d74d5f997da0daa728e06d1f47029 (diff)
arm64: zynqmp: Convert invoke_smc() to xilinx_pm_request()
Remove macros which use PM_SIP_SVC offset and convert invoke_smc() to xilinx_pm_request() which do calculation with PM_SIP_SVC already. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-zynqmp/cpu.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/arm/mach-zynqmp/cpu.c b/arch/arm/mach-zynqmp/cpu.c
index 8a2677b8a9b..b90d08bbdd4 100644
--- a/arch/arm/mach-zynqmp/cpu.c
+++ b/arch/arm/mach-zynqmp/cpu.c
@@ -151,9 +151,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 +184,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 +205,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