diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-07-08 09:11:24 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-07-08 09:11:25 +0200 |
| commit | 8fcdf10295b40ac42f10a642fae61da066a15390 (patch) | |
| tree | 344ea570b9fd7fab881a717039b70bf1cea2f20a /drivers/soc | |
| parent | e0ed9e672565be5db8b2e6d95f047d46140e3297 (diff) | |
| parent | acd6510dd7ab3664b69eb99e37c4fd6325a7d442 (diff) | |
Merge tag 'zynqmp-soc-for-v5.20' of https://github.com/Xilinx/linux-xlnx into arm/soc
arm64: ZynqMP SoC changes for v5.20
- Register SGI separately out of EEMI
* tag 'zynqmp-soc-for-v5.20' of https://github.com/Xilinx/linux-xlnx:
firmware: xilinx: Add TF_A_PM_REGISTER_SGI SMC call
Link: https://lore.kernel.org/r/0196d1f3-e9c7-ef51-143d-e98b14980f63@monstr.eu
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/xilinx/xlnx_event_manager.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/soc/xilinx/xlnx_event_manager.c b/drivers/soc/xilinx/xlnx_event_manager.c index 5dcb7665fe22..2de082765bef 100644 --- a/drivers/soc/xilinx/xlnx_event_manager.c +++ b/drivers/soc/xilinx/xlnx_event_manager.c @@ -647,8 +647,7 @@ static int xlnx_event_manager_probe(struct platform_device *pdev) cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "soc/event:starting", xlnx_event_cpuhp_start, xlnx_event_cpuhp_down); - ret = zynqmp_pm_invoke_fn(PM_IOCTL, 0, IOCTL_REGISTER_SGI, sgi_num, - 0, NULL); + ret = zynqmp_pm_register_sgi(sgi_num, 0); if (ret) { dev_err(&pdev->dev, "SGI %d Registration over TF-A failed with %d\n", sgi_num, ret); xlnx_event_cleanup_sgi(pdev); @@ -681,7 +680,7 @@ static int xlnx_event_manager_remove(struct platform_device *pdev) kfree(eve_data); } - ret = zynqmp_pm_invoke_fn(PM_IOCTL, 0, IOCTL_REGISTER_SGI, 0, 1, NULL); + ret = zynqmp_pm_register_sgi(0, 1); if (ret) dev_err(&pdev->dev, "SGI unregistration over TF-A failed with %d\n", ret); |