From c31ce8bf63e1d0d20c540f58bbe3f7ad08c65d15 Mon Sep 17 00:00:00 2001 From: Elaine Zhang Date: Tue, 16 Oct 2018 15:26:42 +0800 Subject: [PATCH] soc: rockchip: power-domain: Add regulator support The power domains are supplied by regulators. Add support for them so that the regulators are properly turned on before a domain is powered up and turned off when a domain is powered down. Change-Id: I43ad569e1b82a8e818cbbf2ffcfa6a965d993bbf Signed-off-by: Elaine Zhang --- drivers/soc/rockchip/pm_domains.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c index 5925f45cb333..9fc727cb8522 100644 --- a/drivers/soc/rockchip/pm_domains.c +++ b/drivers/soc/rockchip/pm_domains.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -75,6 +76,7 @@ struct rockchip_pm_domain { struct clk_bulk_data *clks; bool is_ignore_pwr; bool is_qos_saved; + struct regulator *supply; }; struct rockchip_pmu { @@ -379,6 +381,21 @@ static int rockchip_pd_power(struct rockchip_pm_domain *pd, bool power_on) mutex_lock(&pmu->mutex); if (rockchip_pmu_domain_is_on(pd) != power_on) { + if (IS_ERR_OR_NULL(pd->supply) && + PTR_ERR(pd->supply) != -ENODEV) + pd->supply = devm_regulator_get_optional(pd->pmu->dev, + genpd->name); + + if (power_on && !IS_ERR(pd->supply)) { + ret = regulator_enable(pd->supply); + if (ret < 0) { + dev_err(pd->pmu->dev, "failed to set vdd supply enable '%s',\n", + genpd->name); + mutex_unlock(&pmu->mutex); + return ret; + } + } + ret = clk_bulk_enable(pd->num_clks, pd->clks); if (ret < 0) { dev_err(pmu->dev, "failed to enable clocks\n"); @@ -421,6 +438,9 @@ static int rockchip_pd_power(struct rockchip_pm_domain *pd, bool power_on) out: clk_bulk_disable(pd->num_clks, pd->clks); + + if (!power_on && !IS_ERR(pd->supply)) + ret = regulator_disable(pd->supply); } mutex_unlock(&pmu->mutex);