soc: imx: imx8m-blk-ctrl: Defer probe if 'bus' genpd is not yet ready
authorBenjamin Gaignard <benjamin.gaignard@collabora.com>
Mon, 19 Sep 2022 12:13:02 +0000 (14:13 +0200)
committerShawn Guo <shawnguo@kernel.org>
Sun, 23 Oct 2022 09:23:21 +0000 (17:23 +0800)
Depending of the boot sequence 'bus' genpd could be probed after imx8m-blk-ctrl
which led driver probe to fail. Change the returned error to allow
to defer the probe in this case.

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
drivers/soc/imx/imx8m-blk-ctrl.c

index 00879615a701588f3c52ef025958ba3dd3b3a4fc..ddcf6be3d8b4add990c42c6c9fe55eb6fa3ef9d3 100644 (file)
@@ -210,9 +210,14 @@ static int imx8m_blk_ctrl_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        bc->bus_power_dev = genpd_dev_pm_attach_by_name(dev, "bus");
-       if (IS_ERR(bc->bus_power_dev))
-               return dev_err_probe(dev, PTR_ERR(bc->bus_power_dev),
-                                    "failed to attach power domain \"bus\"\n");
+       if (IS_ERR(bc->bus_power_dev)) {
+               if (PTR_ERR(bc->bus_power_dev) == -ENODEV)
+                       return dev_err_probe(dev, -EPROBE_DEFER,
+                                            "failed to attach power domain \"bus\"\n");
+               else
+                       return dev_err_probe(dev, PTR_ERR(bc->bus_power_dev),
+                                            "failed to attach power domain \"bus\"\n");
+       }
 
        for (i = 0; i < bc_data->num_domains; i++) {
                const struct imx8m_blk_ctrl_domain_data *data = &bc_data->domains[i];