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

28 Feb 2022

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
---
drivers/firmware/firmware-zynqmp.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/firmware/firmware-zynqmp.c b/drivers/firmware/firmware-zynqmp.c
index 8916c5589635..78da5abc5d3e 100644
--- 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);
-- 
2.35.1


    

Michal Simek

Michal Simek

Signed-off-by: Michal Simek michal.simek@xilinx.com

tags (0)

participants (2)