pmdomain:rockchip: Fix init genpd as GENPD_STATE_ON before regulator ready

RK3588_PD_NPU initialize as GENPD_STATE_ON before regulator ready.
rknn_iommu initlized success and suspend RK3588_PD_NPU. When rocket
driver register, it will resume rknn_iommu.

If regulator is still not ready at this point, rknn_iommu resume fail,
pm runtime status will be error: -EPROBE_DEFER.

This patch set pmdomain to off if it need regulator during probe,
consumer device can power on pmdomain after regulator ready.

Signed-off-by: Frank Zhang <rmxpzlb@gmail.com>
Tested-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
Tested-by: Quentin Schulz <quentin.schulz@cherry.de>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Fixes: db6df2e3fc16 ("pmdomain: rockchip: add regulator support")
Cc: stable@vger.kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/pmdomain/rockchip/pm-domains.c b/drivers/pmdomain/rockchip/pm-domains.c
index 4f1336a0f49a45a5fe244cefb97bd8353784f4a8..997e93c12951cf5d70c1b69f85a4106b616f0e77 100644 (file)
--- a/drivers/pmdomain/rockchip/pm-domains.c
+++ b/drivers/pmdomain/rockchip/pm-domains.c
@@ -879,6 +879,16 @@ static int rockchip_pm_add_one_domain(struct rockchip_pmu *pmu,
                pd->genpd.name = pd->info->name;
        else
                pd->genpd.name = kbasename(node->full_name);
+
+       /*
+        * power domain's needing a regulator should default to off, since
+        * the regulator state is unknown at probe time. Also the regulator
+        * state cannot be checked, since that usually requires IP needing
+        * (a different) power domain.
+        */
+       if (pd->info->need_regulator)
+               rockchip_pd_power(pd, false);
+
        pd->genpd.power_off = rockchip_pd_power_off;
        pd->genpd.power_on = rockchip_pd_power_on;
        pd->genpd.attach_dev = rockchip_pd_attach_dev;