From bfb60af6aa182e50545f10bbf0a25a61b2aa6d8f Mon Sep 17 00:00:00 2001 From: Elaine Zhang Date: Fri, 8 Jan 2021 18:24:02 +0800 Subject: [PATCH] soc: rockchip: power-domain: remove the flag GENPD_FLAG_PM_CLK make CLK and PD independent on/off. Signed-off-by: Elaine Zhang Change-Id: I77de7602f10a6cca5e9cea342b064e7f3aae4e29 --- drivers/soc/rockchip/pm_domains.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c index 5a7e4465d117..faf6557a56cf 100644 --- a/drivers/soc/rockchip/pm_domains.c +++ b/drivers/soc/rockchip/pm_domains.c @@ -861,12 +861,10 @@ static int rockchip_pm_add_one_domain(struct rockchip_pmu *pmu, pd->genpd.power_on = rockchip_pd_power_on; pd->genpd.attach_dev = rockchip_pd_attach_dev; pd->genpd.detach_dev = rockchip_pd_detach_dev; - pd->genpd.flags = GENPD_FLAG_PM_CLK; if (pd_info->active_wakeup) pd->genpd.flags |= GENPD_FLAG_ACTIVE_WAKEUP; #ifndef MODULE if (pd_info->keepon_startup) { - pd->genpd.flags &= (~GENPD_FLAG_PM_CLK); pd->genpd.flags |= GENPD_FLAG_ALWAYS_ON; if (!rockchip_pmu_domain_is_on(pd)) { error = rockchip_pd_power(pd, true); @@ -1023,7 +1021,6 @@ static void rockchip_pd_keepon_do_release(struct generic_pm_domain *genpd, int enable_count; pd->genpd.flags &= (~GENPD_FLAG_ALWAYS_ON); - pd->genpd.flags |= GENPD_FLAG_PM_CLK; list_for_each_entry(pm_data, &genpd->dev_list, list_node) { if (!atomic_read(&pm_data->dev->power.usage_count)) { enable_count = 0;