arm64: zynqmp: use firmware driver to get version

Use the new function from firmware version to get the firmware version.

Signed-off-by: Ibai Erkiaga <ibai.erkiaga-elorza@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index d9186f463f20bce94bfc18dae18cddfd29a32d69..8a66d3e50aad12dd3e226e2a84973960babe5099 100644 (file)
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -321,7 +321,7 @@ int board_early_init_f(void)
 #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_CLK_ZYNQMP)
        u32 pm_api_version;
 
-       pm_api_version = zynqmp_pmufw_version();
+       pm_api_version = zynqmp_firmware_version();
        printf("PMUFW:\tv%d.%d\n",
               pm_api_version >> ZYNQMP_PM_VERSION_MAJOR_SHIFT,
               pm_api_version & ZYNQMP_PM_VERSION_MINOR_MASK);

diff --git a/drivers/fpga/zynqmppl.c b/drivers/fpga/zynqmppl.c
index 6168626aeef3874f73d9c8120c4a2abe6903401f..c2670271c8ea3ad4a9f15df1e39a65f50f951072 100644 (file)
--- a/drivers/fpga/zynqmppl.c
+++ b/drivers/fpga/zynqmppl.c
@@ -152,7 +152,7 @@ static ulong zynqmp_align_dma_buffer(u32 *buf, u32 len, u32 swap)
 
                buf = new_buf;
        } else if ((swap != SWAP_DONE) &&
-                  (zynqmp_pmufw_version() <= PMUFW_V1_0)) {
+                  (zynqmp_firmware_version() <= PMUFW_V1_0)) {
                /* For bitstream which are aligned */
                new_buf = buf;
 
@@ -205,7 +205,7 @@ static int zynqmp_load(xilinx_desc *desc, const void *buf, size_t bsize,
        u32 ret_payload[PAYLOAD_ARG_CNT];
        bool xilfpga_old = false;
 
-       if (zynqmp_pmufw_version() <= PMUFW_V1_0) {
+       if (zynqmp_firmware_version() <= PMUFW_V1_0) {
                puts("WARN: PMUFW v1.0 or less is detected\n");
                puts("WARN: Not all bitstream formats are supported\n");
                puts("WARN: Please upgrade PMUFW\n");