dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 00:32:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

arm64: versal: Rename versal_pm_request to xilinx_pm_request

Browse Source 
Use generic name instead of Versal specific because this should be also
used on ZynqMP.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek
2019-10-04 15:52:43 +02:00
parent 866225f394
commit 6596270ecb
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/clk/clk_versal.c
View File

@@ -363,7 +363,7 @@ static u32 versal_clock_get_div(u32 clk_id)
u32 ret_payload[PAYLOAD_ARG_CNT]; u32 ret_payload[PAYLOAD_ARG_CNT];
u32 div; u32 div;
versal_pm_request(PM_CLOCK_GETDIVIDER, clk_id, 0, 0, 0, ret_payload); xilinx_pm_request(PM_CLOCK_GETDIVIDER, clk_id, 0, 0, 0, ret_payload);
div = ret_payload[1]; div = ret_payload[1];
return div; return div;
@@ -373,7 +373,7 @@ static u32 versal_clock_set_div(u32 clk_id, u32 div)
{ {
u32 ret_payload[PAYLOAD_ARG_CNT]; u32 ret_payload[PAYLOAD_ARG_CNT];
versal_pm_request(PM_CLOCK_SETDIVIDER, clk_id, div, 0, 0, ret_payload); xilinx_pm_request(PM_CLOCK_SETDIVIDER, clk_id, div, 0, 0, ret_payload);
return div; return div;
} }
@@ -383,7 +383,7 @@ static u64 versal_clock_ref(u32 clk_id)
u32 ret_payload[PAYLOAD_ARG_CNT]; u32 ret_payload[PAYLOAD_ARG_CNT];
int ref; int ref;
versal_pm_request(PM_CLOCK_GETPARENT, clk_id, 0, 0, 0, ret_payload); xilinx_pm_request(PM_CLOCK_GETPARENT, clk_id, 0, 0, 0, ret_payload);
ref = ret_payload[0]; ref = ret_payload[0];
if (!(ref & 1)) if (!(ref & 1))
return ref_clk; return ref_clk;
@@ -402,7 +402,7 @@ static u64 versal_clock_get_pll_rate(u32 clk_id)
u32 parent_rate, parent_id; u32 parent_rate, parent_id;
u32 id = clk_id & 0xFFF; u32 id = clk_id & 0xFFF;
versal_pm_request(PM_CLOCK_GETSTATE, clk_id, 0, 0, 0, ret_payload); xilinx_pm_request(PM_CLOCK_GETSTATE, clk_id, 0, 0, 0, ret_payload);
res = ret_payload[1]; res = ret_payload[1];
if (!res) { if (!res) {
printf("0%x PLL not enabled\n", clk_id); printf("0%x PLL not enabled\n", clk_id);
@@ -412,9 +412,9 @@ static u64 versal_clock_get_pll_rate(u32 clk_id)
parent_id = clock[clock[id].parent[0].id].clk_id; parent_id = clock[clock[id].parent[0].id].clk_id;
parent_rate = versal_clock_ref(parent_id); parent_rate = versal_clock_ref(parent_id);
versal_pm_request(PM_CLOCK_GETDIVIDER, clk_id, 0, 0, 0, ret_payload); xilinx_pm_request(PM_CLOCK_GETDIVIDER, clk_id, 0, 0, 0, ret_payload);
fbdiv = ret_payload[1]; fbdiv = ret_payload[1];
versal_pm_request(PM_CLOCK_PLL_GETPARAM, clk_id, 2, 0, 0, ret_payload); xilinx_pm_request(PM_CLOCK_PLL_GETPARAM, clk_id, 2, 0, 0, ret_payload);
frac = ret_payload[1]; frac = ret_payload[1];
freq = (fbdiv * parent_rate) >> (1 << frac); freq = (fbdiv * parent_rate) >> (1 << frac);
@@ -441,7 +441,7 @@ static u32 versal_clock_get_parentid(u32 clk_id)
u32 id = clk_id & 0xFFF; u32 id = clk_id & 0xFFF;
if (versal_clock_mux(clk_id)) { if (versal_clock_mux(clk_id)) {
versal_pm_request(PM_CLOCK_GETPARENT, clk_id, 0, 0, 0, xilinx_pm_request(PM_CLOCK_GETPARENT, clk_id, 0, 0, 0,
ret_payload); ret_payload);
parent_id = ret_payload[1]; parent_id = ret_payload[1];
} }

2
drivers/firmware/firmware-zynqmp.c
View File

@@ -176,7 +176,7 @@ int __maybe_unused invoke_smc(u32 pm_api_id, u32 arg0, u32 arg1, u32 arg2,
return regs.regs[0]; return regs.regs[0];
} }
int __maybe_unused versal_pm_request(u32 api_id, u32 arg0, u32 arg1, u32 arg2, int __maybe_unused xilinx_pm_request(u32 api_id, u32 arg0, u32 arg1, u32 arg2,
u32 arg3, u32 *ret_payload) u32 arg3, u32 *ret_payload)
{ {
return invoke_smc(PM_SIP_SVC | api_id, arg0, arg1, arg2, arg3, return invoke_smc(PM_SIP_SVC | api_id, arg0, arg1, arg2, arg3,

2
drivers/fpga/versalpl.c
View File

@@ -39,7 +39,7 @@ static int versal_load(xilinx_desc *desc, const void *buf, size_t bsize,
buf_lo = lower_32_bits(bin_buf); buf_lo = lower_32_bits(bin_buf);
buf_hi = upper_32_bits(bin_buf); buf_hi = upper_32_bits(bin_buf);
ret = versal_pm_request(VERSAL_PM_LOAD_PDI, VERSAL_PM_PDI_TYPE, buf_lo, ret = xilinx_pm_request(VERSAL_PM_LOAD_PDI, VERSAL_PM_PDI_TYPE, buf_lo,
buf_hi, 0, ret_payload); buf_hi, 0, ret_payload);
if (ret) if (ret)
puts("PL FPGA LOAD fail\n"); puts("PL FPGA LOAD fail\n");

2
include/zynqmp_firmware.h
View File

@@ -83,7 +83,7 @@ unsigned int zynqmp_firmware_version(void);
void zynqmp_pmufw_load_config_object(const void *cfg_obj, size_t size); void zynqmp_pmufw_load_config_object(const void *cfg_obj, size_t size);
int invoke_smc(u32 pm_api_id, u32 arg0, u32 arg1, u32 arg2, u32 arg3, int invoke_smc(u32 pm_api_id, u32 arg0, u32 arg1, u32 arg2, u32 arg3,
u32 *ret_payload); u32 *ret_payload);
int versal_pm_request(u32 api_id, u32 arg0, u32 arg1, u32 arg2, int xilinx_pm_request(u32 api_id, u32 arg0, u32 arg1, u32 arg2,
u32 arg3, u32 *ret_payload); u32 arg3, u32 *ret_payload);
#endif /* _ZYNQMP_FIRMWARE_H_ */ #endif /* _ZYNQMP_FIRMWARE_H_ */