net: ks8851: Remove type_frame_head

[oweals/u-boot.git] / drivers / firmware / firmware-zynqmp.c

diff --git a/drivers/firmware/firmware-zynqmp.c b/drivers/firmware/firmware-zynqmp.c
index 4911734f6c6342ea2ff6e81d6d4df8574dd52085..2bdf7771f642fdabd2adb20ef39d471f6f1d8356 100644 (file)
--- a/drivers/firmware/firmware-zynqmp.c
+++ b/drivers/firmware/firmware-zynqmp.c
@@ -7,7 +7,10 @@
 
 #include <common.h>
 #include <dm.h>
+#include <log.h>
 #include <zynqmp_firmware.h>
+#include <asm/cache.h>
+#include <asm/ptrace.h>
 
 #if defined(CONFIG_ZYNQMP_IPI)
 #include <mailbox.h>
@@ -51,7 +54,7 @@ static int ipi_req(const u32 *req, size_t req_len, u32 *res, size_t res_maxlen)
 
 static int send_req(const u32 *req, size_t req_len, u32 *res, size_t res_maxlen)
 {
-       if (IS_ENABLED(CONFIG_SPL_BUILD))
+       if (IS_ENABLED(CONFIG_SPL_BUILD) || current_el() == 3)
                return ipi_req(req, req_len, res, res_maxlen);
 
        return xilinx_pm_request(req[0], 0, 0, 0, 0, res);
@@ -110,19 +113,19 @@ void zynqmp_pmufw_load_config_object(const void *cfg_obj, size_t size)
 
 static int zynqmp_power_probe(struct udevice *dev)
 {
-       int ret = 0;
+       int ret;
 
        debug("%s, (dev=%p)\n", __func__, dev);
 
        ret = mbox_get_by_name(dev, "tx", &zynqmp_power.tx_chan);
        if (ret) {
-               debug("%s, cannot tx mailbox\n", __func__);
+               debug("%s: Cannot find tx mailbox\n", __func__);
                return ret;
        }
 
        ret = mbox_get_by_name(dev, "rx", &zynqmp_power.rx_chan);
        if (ret) {
-               debug("%s, cannot rx mailbox\n", __func__);
+               debug("%s: Cannot find rx mailbox\n", __func__);
                return ret;
        }
 
@@ -187,6 +190,5 @@ static const struct udevice_id zynqmp_firmware_ids[] = {
 U_BOOT_DRIVER(zynqmp_firmware) = {
        .id = UCLASS_FIRMWARE,
        .name = "zynqmp-firmware",
-       .probe = dm_scan_fdt_dev,
        .of_match = zynqmp_firmware_ids,
 };