firmware: zynqmp: Do not bind PD driver in SPL if disabled

Change if condition to cover SPL flow. SPL needs to have
CONFIG_SPL_POWER_DOMAIN enabled to be able to bind
CONFIG_ZYNQMP_POWER_DOMAIN driver.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Link: https://lore.kernel.org/r/8e1d381013a0ce39d736da166d2b401c4b12d38a.1646064792.git.michal.simek@xilinx.com

diff --git a/drivers/firmware/firmware-zynqmp.c b/drivers/firmware/firmware-zynqmp.c
index 8916c558963519f67093767300f55b6d50593d35..78da5abc5d3e834aff5b716716c891742ac24a6f 100644 (file)
--- a/drivers/firmware/firmware-zynqmp.c
+++ b/drivers/firmware/firmware-zynqmp.c
@@ -334,7 +334,11 @@ static int zynqmp_firmware_bind(struct udevice *dev)
        int ret;
        struct udevice *child;
 
-       if (IS_ENABLED(CONFIG_ZYNQMP_POWER_DOMAIN)) {
+       if ((IS_ENABLED(CONFIG_SPL_BUILD) &&
+            IS_ENABLED(CONFIG_SPL_POWER_DOMAIN) &&
+            IS_ENABLED(CONFIG_ZYNQMP_POWER_DOMAIN)) ||
+            (!IS_ENABLED(CONFIG_SPL_BUILD) &&
+             IS_ENABLED(CONFIG_ZYNQMP_POWER_DOMAIN))) {
                ret = device_bind_driver_to_node(dev, "zynqmp_power_domain",
                                                 "zynqmp_power_domain",
                                                 dev_ofnode(dev), &child);