| Message ID | 8e1d381013a0ce39d736da166d2b401c4b12d38a.1646064792.git.michal.simek@xilinx.com |
|---|---|
| State | Accepted |
| Commit | f307c688ea951978ebcceb5536aa31c0249b33df |
| Delegated to: | Michal Simek |
| Headers | show |
| Series | firmware: zynqmp: Do not bind PD driver in SPL if disabled | expand |
po 28. 2. 2022 v 17:13 odesÃlatel Michal Simek <michal.simek@xilinx.com> napsal: > > 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 > Applied. M
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);
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(-)